This commit was manufactured by cvs2svn to create tag 'v200606061605'.
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore b/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore
deleted file mode 100644
index 0598c54..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.j2ee.doc.user_1.0.0.jar
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/.project b/docs/org.eclipse.jst.j2ee.doc.user/.project
deleted file mode 100644
index 86d9408..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Copy of org.eclipse.jst.j2ee.doc.user</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <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>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 66b2904..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.doc.user; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/about.html b/docs/org.eclipse.jst.j2ee.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/build.properties b/docs/org.eclipse.jst.j2ee.doc.user/build.properties
deleted file mode 100644
index a3ec344..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = images/,\
- jst_j2ee_toc.xml,\
- topics/,\
- plugin.xml,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- org.eclipse.jst.j2ee.doc.userindex.html
-src.includes = build.properties,\
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif
deleted file mode 100644
index c51d9d9..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
deleted file mode 100644
index 81fb1b5..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="J2EE applications - WTP" topic="topics/ph-j2eeapp.html">
- <topic label="J2EE Applications" href="topics/ph-j2eeapp.html">
- <topic label="J2EE architecture" href="topics/cjarch.html"/>
- <topic label="J2EE perspective" href="topics/cjpers.html"/>
- <topic label="Project Explorer view in the J2EE perspective" href="topics/cjview.html"/>
- <topic label="Filters in the Project Explorer view" href="topics/cjviewfilters.html"/>
- <topic label="Working with projects" href="topics/ph-projects.html">
- <topic label="Enterprise application projects" href="topics/cjearproj.html"/>
- <topic label="Application client projects" href="topics/cjappcliproj.html"/>
- <topic label="Creating an enterprise application project" href="topics/tjear.html"/>
- <topic label="Creating an application client project" href="topics/tjappproj.html"/>
- <topic label="Creating a connector project" href="topics/tjrar.html"/>
- <topic label="Specifying target servers for J2EE projects" href="topics/tjtargetserver.html"/>
- <topic label="Adding a facet to a J2EE project" href="topics/taddingfacet.html"/>
- <anchor id="J2EEProjectFacets"/>
- <topic label="Importing and exporting projects and files" href="topics/ph-importexport.html">
- <topic label="Exporting an application client project" href="topics/tjexpapp.html"/>
- <topic label="Exporting an enterprise application into an EAR file" href="topics/tjexpear.html"/>
- <topic label="Exporting connector projects to RAR files" href="topics/tjexprar.html"/>
- <topic label="Importing an enterprise application EAR file" href="topics/tjimpear.html"/>
- <topic label="Importing an application client JAR file" href="topics/tjimpapp.html"/>
- <topic label="Importing a connector project RAR file" href="topics/tjimprar.html"/>
- <topic label="Cyclical dependencies between J2EE modules" href="topics/cjcircle.html"/>
- <topic label="Correcting cyclical dependencies after an EAR is imported" href="topics/tjcircleb.html"/>
- </topic>
- </topic>
- <topic label="Validating code in enterprise applications" href="topics/tjval.html">
- <topic label="Common validation errors and solutions" href="topics/rvalerr.html"/>
- <topic label="J2EE Validators" href="topics/rvalidators.html"/>
- <topic label="Enabling automatic code validation" href="topics/tjvalauto.html"/>
- <topic label="Enabling build validation" href="topics/tjvalbuild.html"/>
- <topic label="Disabling a validator" href="topics/tjvaldisable.html"/>
- <topic label="Overriding global validation preferences" href="topics/tjvalglobalpref.html"/>
- <topic label="Manually validating code" href="topics/tjvalmanual.html"/>
- <topic label="Selecting code validators" href="topics/tjvalselect.html"/>
- </topic>
- <topic label="Reference" href="topics/ph-ref.html">
- <topic label="J2EE Validators" href="topics/rvalidators.html"/>
- <topic label="Common validation errors and solutions" href="topics/rvalerr.html"/>
- <topic label="Limitations of J2EE development tools" href="topics/rjlimitcurrent.html"/>
- </topic>
- </topic>
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.html b/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.html
deleted file mode 100644
index 6be89b6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2005" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<link rel="stylesheet" type="text/css" href="../org.eclipse.wst.doc.user/ibmdita.css" />
-<link rel="stylesheet" type="text/css" href="../org.eclipse.wst.doc.user/common.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_41" href="#IDX1_41">A</a>
-<a name="IDX0_42" href="#IDX1_42">B</a>
-<a name="IDX0_43" href="#IDX1_43">C</a>
-<a name="IDX0_45" href="#IDX1_45">E</a>
-<a name="IDX0_4A" href="#IDX1_4A">J</a>
-<a name="IDX0_50" href="#IDX1_50">P</a>
-<a name="IDX0_52" href="#IDX1_52">R</a>
-<a name="IDX0_56" href="#IDX1_56">V</a>
-<hr></hr>
-<strong><a name="IDX1_41" href="#IDX0_41">A</a></strong>
-<ul class="indexlist">
-<li>Ant
-<ul class="indexlist">
-<li><a href="topics/cjant.html#cjant">additional information</a>
-</li>
-<li><a href="topics/cjant.html#cjant">overview</a>
-</li>
-</ul>
-</li>
-<li>application client projects
-<ul class="indexlist">
-<li><a href="topics/cjappcliproj.html#cjappcliproj">overview</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_42" href="#IDX0_42">B</a></strong>
-<ul class="indexlist">
-<li>build validation
-<ul class="indexlist">
-<li><a href="topics/tjvalbuild.html#tjvalbuild">enabling</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_43" href="#IDX0_43">C</a></strong>
-<ul class="indexlist">
-<li>code validation
-<ul class="indexlist">
-<li><a href="topics/tjvalauto.html#tjvalauto">automatic</a>
-</li>
-<li><a href="topics/tjvaldisable.html#tjvaldisable">disabling validators</a>
-</li>
-<li><a href="topics/rvalerr.html#rvalerr">errors</a>
-</li>
-<li><a href="topics/rvalidators.html#rvalidators">J2EE validators</a>
-</li>
-<li><a href="topics/tjvalmanual.html#tjvalmanual">manual</a>
-</li>
-<li><a href="topics/tjvalglobalpref.html#tjvalglobalpref">overriding global preferences</a>
-</li>
-<li><a href="topics/tjval.html#tjval">overview</a>
-</li>
-<li><a href="topics/tjvalselect.html#tjvalselect">selecting validators</a>
-</li>
-<li><a href="topics/rvalerr.html#rvalerr">solutions to errors</a>
-</li>
-</ul>
-</li>
-<li>connector projects
-<ul class="indexlist">
-<li><a href="topics/tjexprar.html#tjexprar">exporting</a>
-</li>
-<li><a href="topics/tjimprar.html#tjimprar">importing</a>
-</li>
-</ul>
-</li>
-<li>cyclical dependencies
-<ul class="indexlist">
-<li><a href="topics/tjcircleb.html#tjcircleb">correcting</a>
-</li>
-<li><a href="topics/cjcircle.html#cjcircle">overview</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_45" href="#IDX0_45">E</a></strong>
-<ul class="indexlist">
-<li>enterprise application projects
-<ul class="indexlist">
-<li><a href="topics/cjearproj.html#cjearproj">overview</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4A" href="#IDX0_4A">J</a></strong>
-<ul class="indexlist">
-<li>J2EE development
-<ul class="indexlist">
-<li><a href="topics/rjlimitcurrent.html#rjlimitcurrent">limitations</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
-<ul class="indexlist">
-<li>perspectives
-<ul class="indexlist">
-<li><a href="topics/cjpers.html#cjpers">J2EE</a>
-</li>
-</ul>
-</li>
-<li>projects
-<ul class="indexlist">
-<li><a href="topics/cjappcliproj.html#cjappcliproj">application client</a>
-</li>
-<li><a href="topics/tjcircleb.html#tjcircleb">correcting cyclical dependencies</a>
-</li>
-<li><a href="topics/cjcircle.html#cjcircle">cyclical dependencies</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_52" href="#IDX0_52">R</a></strong>
-<ul class="indexlist">
-<li>RAR files
-<ul class="indexlist">
-<li><a href="topics/tjexprar.html#tjexprar">exporting</a>
-</li>
-<li><a href="topics/tjimprar.html#tjimprar">importing</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_56" href="#IDX0_56">V</a></strong>
-<ul class="indexlist">
-<li>validation
-<ul class="indexlist">
-<li><a href="topics/tjvalauto.html#tjvalauto">automatic</a>
-</li>
-<li><a href="topics/tjvalbuild.html#tjvalbuild">build validation</a>
-</li>
-<li><a href="topics/tjvaldisable.html#tjvaldisable">disabling validators</a>
-</li>
-<li><a href="topics/rvalerr.html#rvalerr">errors</a>
-</li>
-<li><a href="topics/rvalidators.html#rvalidators">J2EE validators</a>
-</li>
-<li><a href="topics/tjvalmanual.html#tjvalmanual">manual</a>
-</li>
-<li><a href="topics/tjvalglobalpref.html#tjvalglobalpref">overriding global preferences</a>
-</li>
-<li><a href="topics/tjval.html#tjval">overview</a>
-</li>
-<li><a href="topics/tjvalselect.html#tjvalselect">selecting validators</a>
-</li>
-<li><a href="topics/rvalerr.html#rvalerr">solutions to errors</a>
-</li>
-</ul>
-</li>
-<li>views
-<ul class="indexlist">
-<li><a href="topics/cjview.html#cjview">Project Explorer</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties b/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
deleted file mode 100644
index 2ec6949..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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 = J2EE tools documentation
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml b/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml
deleted file mode 100644
index 1354079..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
- <plugin>
-<extension point="org.eclipse.help.toc">
- <toc file="jst_j2ee_toc.xml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
deleted file mode 100644
index 16a37f8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Application client projects</title>
-</head>
-<body id="cjappcliproj"><a name="cjappcliproj"><!-- --></a>
-<h1 class="topictitle1">Application client projects</h1>
-<div><p> Application client projects contain the resources needed for application
-client modules. An application client module is used to contain a full-function
-client Java™ application (non Web-based) that connects to and
-uses the J2EE resources defined in your server. When you place the client
-code in an application client module instead of a simple JAR file, the application
-client benefits from the server's resources (it does not need to re-specify
-the class path to J2EE and server JAR files) as well as from easier JNDI lookup
-(the client container fills in the initial context and other parameters).
-The application client project allows you to work as if you are creating a
-standalone Java application in a Java project.</p>
-<p>An application client project enables you to do the following things:</p>
-<ul><li>Develop the Java classes that implement the client module</li>
-<li>Set the application client deployment descriptor</li>
-<li>Test the application client</li>
-</ul>
-<p>Like Java projects, application client projects contain the
-resources needed for application clients, including Java class
-files. When you create a new application client project, the environment is
-set up for Java development. A Java <em>builder</em> is associated with the
-project so the Java source can be incrementally compiled as it is updated.
-The application client project contains information about the type hierarchy
-and Java elements.
-This information is kept current as changes are made, and the Java builder
-will incrementally compile the resources within these projects as the resources
-are updated.</p>
-<p>In the workbench, application client projects are always referenced by
-enterprise application (EAR) projects. When you create an application client
-project, you specify the enterprise application project to which the application
-client project belongs. A module element is automatically added to the <samp class="codeph">application.xml</samp> deployment
-descriptor for the EAR project.</p>
-<p>An application client project is deployed as a JAR file. This application
-client JAR file contains the necessary resources for the application, including Java class
-files, and deployment descriptor information and any meta-data extensions
-and bindings files.</p>
-<p>Application client projects are typically run on networked client systems
-connected to J2EE (EJB) servers. The point of entry for the application client
-is a Java main-class,
-which is simply a Java class that contains a static main method. The class
-is declared in the manifest file of the client module. </p>
-<p>A J2EE application client container provides access to the J2EE service
-(JNDI naming services, deployment services, transaction services, and security
-services) and communications APIs (internet protocols, Remote Method Invocation
-protocols, Object Management Group protocols, Messaging protocols, and data
-formats).</p>
-<p>By default, application client projects contain one folder named <span class="uicontrol">appClientModule</span>,
-which contains both Java source code and compiled <samp class="codeph">.class</samp> files,
-along with all the meta-data files in the <span class="uicontrol">META-INF</span> subfolder.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
deleted file mode 100644
index 68eea00..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>J2EE architecture</title>
-</head>
-<body id="cjarch"><a name="cjarch"><!-- --></a>
-<h1 class="topictitle1">J2EE architecture</h1>
-<div><p>The Java™ 2 Platform, Enterprise Edition (J2EE) provides
-a standard for developing multitier, enterprise services.</p>
-<p>The economy and technology of today have intensified the need for faster,
-more efficient, and larger-scale information management solutions. The J2EE
-specification satisfies these challenges by providing a programming model
-that improves development productivity, standardizes the platform for hosting
-enterprise applications, and ensures portability of developed applications
-with an extensive test suite.</p>
-<p>J2EE architecture supports component-based development of multi-tier enterprise
-applications. A J2EE application system typically includes the following tiers:</p>
-<ul><li><strong>Client tier</strong>: In the client tier, Web components, such as Servlets
-and JavaServer Pages (JSPs), or standalone Java applications provide a dynamic
-interface to the middle tier.</li>
-<li><strong>Middle tier</strong>: In the server tier, or middle tier, enterprise beans
-and Web Services encapsulate reusable, distributable business logic for the
-application. These server-tier components are contained on a J2EE Application
-Server, which provides the platform for these components to perform actions
-and store data.</li>
-<li><strong>Enterprise data tier</strong>: In the data tier, the enterprise's data is
-stored and persisted, typically in a relational database.</li>
-</ul>
-<p>J2EE applications are comprised of components, containers, and services.
-Components are application-level components. Web components, such as Servlets
-and JSPs, provide dynamic responses to requests from a Web page. EJB components
-contain server-side business logic for enterprise applications. Web and EJB
-component containers host services that support Web and EJB modules.</p>
-<p>For more information on J2EE architecture and its implicit technologies,
-download and read the <a href="http://java.sun.com/j2ee/download.html#platformspec" target="_blank">J2EE 1.4 Specification</a>.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE Applications</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project contains the hierarchy of resources that are required to deploy a J2EE enterprise application, often referred to as an EAR file.">Enterprise application projects</a></div>
-<div><a href="../topics/cjappcliproj.html">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
deleted file mode 100644
index 5128cba..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Cyclical dependencies between J2EE modules</title>
-</head>
-<body id="cjcircle"><a name="cjcircle"><!-- --></a>
-<h1 class="topictitle1">Cyclical dependencies between J2EE modules</h1>
-<div><p>A cyclical dependency between two or more modules in an enterprise application
-most commonly occurs when projects are imported from outside the Workbench.
-When a cycle exists between two or more modules in an enterprise application,
-the Java™ builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p>
-<p>Therefore, the best practice is to componentize your projects or modules.
-This allows you to have your module dependencies function as a tree instead
-of a cycle diagram. This practice has the added benefit of producing a better
-factored and layered application.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
deleted file mode 100644
index 756454c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Enterprise application projects</title>
-</head>
-<body id="cjearproj"><a name="cjearproj"><!-- --></a>
-<h1 class="topictitle1">Enterprise application projects</h1>
-<div><p>An enterprise application project contains the hierarchy of resources
-that are required to deploy a J2EE enterprise application, often referred
-to as an EAR file.</p>
-<p>An enterprise application project also contains a set of references to
-other J2EE modules and Java™ projects that are combined to compose
-an EAR file. These projects can be Web modules, EJB modules, application client
-modules, connector modules, general utility Java JAR files, and EJB client JAR files.
-Enterprise application projects created in the workbench include a deployment
-descriptor, as well as files that are common to all J2EE modules
-that are defined in the deployment descriptor.</p>
-<p>When a J2EE module project is created, it can be associated with an enterprise
-application project. The project wizards aid this by allowing you to specify
-a new or existing enterprise application project. Enterprise application projects
-are exported as EAR (enterprise archive) files that include all files defined
-in the Enterprise Application project as well as the appropriate archive file
-for each J2EE module or utility JAR project defined in the deployment descriptor,
-such as Web archive (WAR) files and EJB JAR files.</p>
-<p>An enterprise application can contain utility JAR files that are to be
-used by the contained modules. This allows sharing of code at the application
-level by multiple Web, EJB, or application client modules. These JAR files
-are commonly referred to as <em>utility JAR files.</em> The utility JAR files
-defined for an enterprise application project can be actual JAR files in the
-project, or you can include utility Java projects that are designated to become
-the utility JAR files during assembly and deployment.</p>
-<p>To start developing J2EE applications, you typically first create an enterprise
-application project to contain your Web, EJB, and application client modules.
-The enterprise application project is used to compose an entire application
-from the various modules. Since no source code is built directly into an enterprise
-application, these projects are not Java projects, and they are not compiled
-by the Java builder.</p>
-<div class="p">When you create an enterprise application project using the workbench,
-the following key files are automatically created:<dl><dt class="dlterm">META-INF/application.xml</dt>
-<dd>This file is the deployment descriptor for the enterprise application,
-as defined in the J2EE specification, that is responsible for associating
-J2EE modules to a specific EAR file. It is created in the <span class="uicontrol">META-INF</span> folder.</dd>
-<dt class="dlterm">META-INF/.modulemaps</dt>
-<dd>This file contains the mappings to the contained modules and utility JAR
-projects.</dd>
-</dl>
-</div>
-<div class="p">The following workbench artifacts are also created in an enterprise application
-project but will not become part of the EAR file, and you should not edit
-them manually:<dl><dt class="dlterm">.j2ee</dt>
-<dd>This is a workbench artifact that includes the product version and J2EE
-specification level for the project.</dd>
-<dt class="dlterm">.project</dt>
-<dd>This is a workbench artifact, the standard project description file.</dd>
-<dt class="dlterm">.runtime</dt>
-<dd>This is a workbench artifact that contains the target server definition.</dd>
-</dl>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
deleted file mode 100644
index 2d5d772..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>J2EE perspective</title>
-</head>
-<body id="cjpers"><a name="cjpers"><!-- --></a>
-<h1 class="topictitle1">J2EE perspective</h1>
-<div><p>The J2EE perspective includes workbench views that you can use
-when developing resources for enterprise applications, EJB modules, Web modules,
-application client modules, and connector projects or modules.</p>
-<p>You can rearrange the location, tiling, and size of the views within the
-perspective. You can also add other views to the J2EE perspective by clicking <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Show View</span></span> and
-selecting the view.</p>
-<p>The workbench provides synchronization between different views and editors.
-This is also true in the J2EE perspective.</p>
-<p>By default, the J2EE perspective includes the following workbench views:</p>
-<dl><dt class="dlterm"><span class="uicontrol">Project Explorer</span></dt>
-<dd>The Project Explorer provides an integrated view of your projects, grouped
-by type, and their artifacts related to J2EE development. It displays navigable
-models of J2EE deployment descriptors, Java™ artifacts (source folders, packages,
-and classes), navigable models of the available Web services, and specialized
-views of Web modules to simplify the development of dynamic Web applications.
-In addition, EJB database mapping and the configuration of projects for a
-J2EE application server are made readily available.</dd>
-<dt class="dlterm"><span class="uicontrol"> Outline</span></dt>
-<dd>The Outline view in the J2EE perspective shows the outline of the file
-that you are editing. For example, if you are using a tabbed deployment descriptor
-editor, the Outline view shows the outline for the selected page's elements,
-and if you are editing on the Source tab, the outline for the XML source is
-displayed. If you are editing an enterprise bean in the Java editor,
-the Outline view shows the outline for the Java class.</dd>
-<dt class="dlterm"><span class="uicontrol">Tasks</span></dt>
-<dd>The Tasks view lists the to-do items that you have entered.</dd>
-<dt class="dlterm"><span class="uicontrol">Problems</span></dt>
-<dd>The Problems view displays problems, warnings, or errors associated with
-the selected project. You can double-click on an item to address the specific
-problem in the appropriate resource.</dd>
-<dt class="dlterm"><span class="uicontrol">Properties</span></dt>
-<dd>The Properties view provides a tabular view of the properties and associated
-values of objects in files you have open in an editor. For example, you can
-specify converters in the Properties view of the Mapping editor.</dd>
-<dt class="dlterm"><span class="uicontrol">Status bar</span></dt>
-<dd>The Status bar provides a description of the location of selected objects
-in the Project Explorer views in the left side. When file and deployment descriptors
-are open, the status bar shows the read-only state of the files and the line
-and column numbers when applicable. Sometimes when long operations run, a
-status monitor will appear in the status bar, along with a button with a stop
-sign icon. Clicking the stop sign stops the operation when the operation can
-be cancelled.</dd>
-<dt class="dlterm"><span class="uicontrol">Servers</span></dt>
-<dd>The Servers view shows all the created server instances. You can start
-and stop each server from this view, and you can launch the test client.</dd>
-<dt class="dlterm"><span class="uicontrol">Snippets</span></dt>
-<dd>The Snippets view provides categorized pieces of code that
-you can insert into appropriate places in your source code.</dd>
-</dl>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE Applications</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
deleted file mode 100644
index 249762f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Project Explorer view in the J2EE perspective</title>
-</head>
-<body id="cjview"><a name="cjview"><!-- --></a>
-<h1 class="topictitle1">Project Explorer view in the J2EE perspective</h1>
-<div><p>While developing J2EE applications in the J2EE perspective, the
-Project Explorer view is your main view of your J2EE projects and resources.</p>
-<div class="section"><h4 class="sectiontitle">Project Explorer view</h4>The Project Explorer view provides
-an integrated view of all project resources, including models of J2EE deployment
-descriptors, Java™ artifacts, resources, Web services, databases,
-and dynamic Web project artifacts.<p>You should use this view to work with
-your J2EE deployment descriptors and their content. You can easily view an
-enterprise application project and see all of the modules associated with
-it. </p>
-<p>You can also filter what you see in the Project Explorer view to
-hide projects, folders, or files that you don't want to see. To enable or
-disable filters, click the <span class="uicontrol">Filters</span> button from the
-drop-down menu at the top right corner of the view. For more information,
-see <a href="cjviewfilters.html" title="You can filter the Project Explorer view to hide projects, folders, or files that you don't want to see.">Filters in the Project Explorer view</a>.</p>
-<p>The following image shows the Project Explorer view with the <span class="uicontrol">Group
-projects by type</span> option selected in the toolbar:<br /><img src="../images/ProjectExplorer.gif" alt="Screen capture of the Project Explorer view" /><br /></p>
-<dl><dt class="dlterm">Enterprise Applications</dt>
-<dd>Shows a hierarchical model of all enterprise application projects.</dd>
-<dt class="dlterm">Application Client Projects</dt>
-<dd>Shows a hierarchical model of all application client modules.</dd>
-<dt class="dlterm">Connector Projects</dt>
-<dd>Shows a hierarchical model of all connector modules.</dd>
-<dt class="dlterm">Dynamic Web Projects</dt>
-<dd>Shows a hierarchical model of all dynamic Web modules.</dd>
-<dt class="dlterm">EJB Projects</dt>
-<dd>Shows a hierarchical model of all EJB projects.</dd>
-<dt class="dlterm">Other Projects</dt>
-<dd>Shows any non-J2EE module projects, such as Java projects. These Java projects
-can be any of the following types: <ul><li>Utility projects for existing Enterprise Application projects in your
-workspace</li>
-<li>EJB Client JAR Projects, which include the client interface classes (remote,
-home, local, or local home interfaces) for beans in EJB projects</li>
-<li>Java projects
-that are in your workspace but unrelated to your J2EE development</li>
-</ul>
-</dd>
-</dl>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE Applications</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjviewfilters.html" title="You can filter the Project Explorer view to hide projects, folders, or files that you don't want to see.">Filters in the Project Explorer view</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html
deleted file mode 100644
index 90321a0..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Filters in the Project Explorer view</title>
-</head>
-<body id="cjviewfilters"><a name="cjviewfilters"><!-- --></a>
-<h1 class="topictitle1">Filters in the Project Explorer view</h1>
-<div><p>You can filter the Project Explorer view to hide projects, folders,
-or files that you don't want to see.</p>
-<p>To enable or disable filters, open the Select Common Navigator Filters
-window by clicking the <span class="uicontrol">Filters</span> button from the drop-down
-menu at the top right corner of the view. This window lists the available
-filters.</p>
-<p>On the Select Common Navigator Filters tab, select the check boxes next
-to the filters you want to enable. For example, when the <span class="uicontrol">Closed
-projects</span> filter is enabled, closed projects are not shown in the
-Project Explorer view. Other filters can hide empty packages, non-java files,
-and files with names ending in ".class".</p>
-<p>On the Available Extensions and Filters tab, the filters work in the opposite
-way: the selected check boxes describe the projects, folders, and files that
-are shown in the Project Explorer view. For example, if you clear the check
-box next to <span class="uicontrol">J2EE Deployment Descriptors</span>, the deployment
-descriptors are hidden from each project in the view.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE Applications</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjview.html" title="While developing J2EE applications in the J2EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.">Project Explorer view in the J2EE perspective</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
deleted file mode 100644
index 1456e93..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Importing and exporting projects and files</title>
-</head>
-<body id="ph-importexport"><a name="ph-importexport"><!-- --></a>
-<h1 class="topictitle1">Importing and exporting projects and files</h1>
-<div><p>These topics cover how to import files and projects into the workbench
-and export files and projects to disk.</p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tjexpapp.html">Exporting an application client project</a></strong><br />
-You can export an application client project as a JAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjexpear.html">Exporting an enterprise application into an EAR file</a></strong><br />
-Enterprise applications are deployed in the form of an EAR file.
-Use the Export wizard to export an enterprise application project into an
-EAR file for deployment.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjexprar.html">Exporting connector projects to RAR files</a></strong><br />
-You can export a connector project to a RAR file in preparation
-for deploying it to a server.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimpear.html">Importing an enterprise application EAR file</a></strong><br />
-Enterprise application projects are deployed into EAR files. You
-can import an enterprise application project by importing it from a deployed
-EAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimpapp.html">Importing an application client JAR file</a></strong><br />
-Application client projects are deployed as JAR files. You can
-import an application client project that has been deployed into a JAR file
-by using the Import wizard.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimprar.html">Importing a connector project RAR file</a></strong><br />
-Connector projects are deployed into RAR files. You can import
-a connector project by importing a deployed RAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjcircle.html">Cyclical dependencies between J2EE modules</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../topics/tjcircleb.html">Correcting cyclical dependencies after an EAR is imported</a></strong><br />
-You can resolve cyclical dependencies after an EAR is imported.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
deleted file mode 100644
index 9b6143c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>J2EE Applications</title>
-</head>
-<body id="ph-j2eeapp"><a name="ph-j2eeapp"><!-- --></a>
-<h1 class="topictitle1">J2EE Applications</h1>
-<div><p>These topics deal with the Java™ 2 Platform, Enterprise Edition (J2EE).</p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjarch.html">J2EE architecture</a></strong><br />
-The Java 2 Platform, Enterprise Edition (J2EE) provides
-a standard for developing multitier, enterprise services.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjpers.html">J2EE perspective</a></strong><br />
-The J2EE perspective includes workbench views that you can use
-when developing resources for enterprise applications, EJB modules, Web modules,
-application client modules, and connector projects or modules.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjview.html">Project Explorer view in the J2EE perspective</a></strong><br />
-While developing J2EE applications in the J2EE perspective, the
-Project Explorer view is your main view of your J2EE projects and resources.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-projects.html">Working with projects</a></strong><br />
-The workbench can work with many different types of projects. The
-following topics cover creating and managing some of the types of projects
-related to J2EE development.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjval.html">Validating code in enterprise applications</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-ref.html">Reference</a></strong><br />
-The following reference material on J2EE is available:</li>
-</ul>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
deleted file mode 100644
index 876ce02..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Working with projects</title>
-</head>
-<body id="phprojects"><a name="phprojects"><!-- --></a>
-<h1 class="topictitle1">Working with projects</h1>
-<div><p>The workbench can work with many different types of projects. The
-following topics cover creating and managing some of the types of projects
-related to J2EE development.</p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjearproj.html">Enterprise application projects</a></strong><br />
-An enterprise application project contains the hierarchy of resources
-that are required to deploy a J2EE enterprise application, often referred
-to as an EAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjappcliproj.html">Application client projects</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../topics/tjtargetserver.html">Specifying target servers for J2EE projects</a></strong><br />
-When you develop J2EE applications, the workbench requires that
-you specify the server runtime environments for your J2EE projects. The target
-server is specified during project creation and import, and it can be changed
-in the project properties. The target server setting is the default mechanism
-for setting the class path for J2EE projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-importexport.html">Importing and exporting projects and files</a></strong><br />
-These topics cover how to import files and projects into the workbench
-and export files and projects to disk.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE Applications</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
deleted file mode 100644
index c24a9c1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Reference</title>
-</head>
-<body id="ph-ref"><a name="ph-ref"><!-- --></a>
-<h1 class="topictitle1">Reference</h1>
-<div><p>The following reference material on J2EE is available:</p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/rvalidators.html">J2EE Validators</a></strong><br />
-This table lists the validators that are available for the different
-project types and gives a brief description of each validator.</li>
-<li class="ulchildlink"><strong><a href="../topics/rvalerr.html">Common validation errors and solutions</a></strong><br />
-You may encounter these common error messages when you validate
-your projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/rjlimitcurrent.html">Limitations of J2EE development tools</a></strong><br />
-This topic outlines current known limitations and restrictions
-for J2EE tooling.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE Applications</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
deleted file mode 100644
index 7220940..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Limitations of J2EE development tools</title>
-</head>
-<body id="rjlimitcurrent"><a name="rjlimitcurrent"><!-- --></a>
-<h1 class="topictitle1">Limitations of J2EE development tools</h1>
-<div><p>This topic outlines current known limitations and restrictions
-for J2EE tooling.</p>
-<div class="section"><h4 class="sectiontitle">Alternate deployment descriptor (alt-dd) elements in enterprise
-applications</h4>The use of alt-dd elements is currently not supported
-in the workbench. The workaround is to edit the deployment descriptors of
-the contained modules.</div>
-<div class="section"><h4 class="sectiontitle">Spaces not supported in JAR URIs within an enterprise application</h4>Spaces
-are not supported in the URI for modules or utility JAR files in an enterprise
-application. The "Class-Path:" attribute of a MANIFEST.MF file in a JAR file
-or module is a space-delimited list of relative paths within an enterprise
-application. A JAR file would not be able to reference another JAR file in
-the EAR if the URI of the referenced JAR file contained spaces.</div>
-<div class="section"><h4 class="sectiontitle">Enterprise application project names should not contain DBCS
-characters</h4><p id="rjlimitcurrent__limitation_ear_dbcs"><a name="rjlimitcurrent__limitation_ear_dbcs"><!-- --></a>When you create an enterprise
-application project, it is recommended that you do not give it a name that
-contains double-byte character set (DBCS) characters.</p>
-</div>
-<div class="section"><h4 class="sectiontitle">Java™ build path updates when removing the dependency
-on a Utility JAR file</h4>When removing the dependency on a Utility JAR,
-the corresponding Java project will be removed from the Java build
-path only if the dependent JAR is still referenced by the EAR project. For
-example, suppose you create a J2EE 1.3 Web project and EAR along with the
-JUnit Java Example
-project. Next, add the JUnit project as a Utility JAR in the EAR, then add
-JUnit as a Java JAR Dependency of the Web project. If you then
-wanted to remove the dependency between JUnit and the Web project, remove
-the Java JAR
-Dependency from the Web project first, then remove the Utility JAR from the
-EAR. Follow this order to ensure that this works correctly.</div>
-<div class="section"><h4 class="sectiontitle">Java JAR Dependencies page fails to update Java build
-path</h4>The Java JAR Dependencies page is not synchronized with
-the Java build
-path page in the project properties dialog. Therefore, a change applied in
-one may not be reflected in the other within the same dialog session. There
-are also some instances where flipping back and forth between the pages will
-cause the update from one to cancel out the update from another when the <span class="uicontrol">OK</span> button
-is clicked or if the <span class="uicontrol">Apply</span> button is clicked prior
-to the <span class="uicontrol">OK</span> button. Typically this will appear as if
-a JAR dependency was added, but the project did not get added to the Java build
-path. The workaround is to reopen the properties dialogs, switch to the JAR
-dependency page, clear and re-select the dependent JAR files, then click <span class="uicontrol">OK</span>.</div>
-<div class="section"><h4 class="sectiontitle">'Invalid project description' error when using a non-default
-project location for a new J2EE project</h4>When you create a new J2EE
-project (including Java, enterprise application, Dynamic Web,
-EJB, application client, and connector projects), you cannot use a project
-location that is already used by another project in the workbench. If you
-choose a project location that is used by another project, the wizard displays
-an "Invalid project description" error dialog or message. If after you receive
-this message you then select a valid project location by clicking the Browse
-button, the project creation will still not finish. The workaround is to click
-Cancel and reopen the project creation wizard.</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
deleted file mode 100644
index 54090d3..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Common validation errors and solutions</title>
-</head>
-<body id="rvalerr"><a name="rvalerr"><!-- --></a>
-<h1 class="topictitle1">Common validation errors and solutions</h1>
-<div><p>You may encounter these common error messages when you validate
-your projects.</p>
-
-<div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" width="20.27027027027027%" id="d0e33">Message prefix</th>
-<th valign="top" width="24.324324324324326%" id="d0e35">Message</th>
-<th valign="top" width="55.4054054054054%" id="d0e37">Explanation</th>
-</tr>
-</thead>
-<tbody><tr><td colspan="3" valign="top" headers="d0e33 d0e35 d0e37 "><span class="uicontrol">Application Client validator</span></td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ1000</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">Validation failed because the application client file
-is not valid. Ensure that the deployment descriptor is valid.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">The application-client.xml file cannot be loaded. The
-project metadata cannot be initialized from the application-client.xml file.
- <ol><li>Ensure the following: <ul><li>that the META-INF folder exists in the application client project</li>
-<li>that META-INF contains the application-client.xml file</li>
-<li>that META-INF is in the project's classpath.</li>
-</ul>
- </li>
-<li>Validate the syntax of the application-client.xml file: in the Navigator
-view, highlight the application-client.xml file, right-click, and select <span class="uicontrol">Validate
-XML file</span>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol>
- </td>
-</tr>
-<tr><td colspan="3" valign="top" headers="d0e33 d0e35 d0e37 "><span class="uicontrol">EAR validator</span></td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ1001</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">The EAR project {0} is invalid.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">The application.xml file cannot be loaded. The project
-metadata cannot be initialized from the application.xml file. <ol><li>Ensure the following: <ul><li>that the META-INF folder exists in the EAR project</li>
-<li>that META-INF contains <samp class="codeph">application.xml</samp></li>
-<li>that META-INF is in the project's classpath.</li>
-</ul>
- </li>
-<li>Validate the syntax of the application.xml file: in the Navigator view,
-highlight the application.xml file, right-click, and select <span class="uicontrol">Validate
-XML file</span>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol>
-</td>
-</tr>
-<tr><td colspan="3" valign="top" headers="d0e33 d0e35 d0e37 "><span class="uicontrol">EJB validator</span></td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2019</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">The {0} key class must be serializable at runtime. </td>
-<td rowspan="3" valign="top" width="55.4054054054054%" headers="d0e37 ">The EJB is compliant with the EJB specification. This
-message is a warning that problems may occur. The warning appears when a type
-needs to be serializable at runtime and when serializability cannot be verified
-at compile-time. A type is serializable if, at runtime, it is a primitive
-type, a primitive array, a remote object, or if it implements java.io.Serializable.
-This message flags java.lang.Object and it cannot be disabled. You can either
-make the object serializable at compile-time or ignore the warning. </td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2412</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">The return type must be serializable at runtime. </td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2413</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">Argument {1} of {0} must be serializable at runtime.</td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2102</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">Either a finder descriptor, or a matching custom finder method on the
-{0} class, must be defined.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">A finder descriptor must exist for every finder method. </td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2873</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">Migrate this bean's datasource binding to a CMP Connection Factory
-binding.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 "> </td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2874</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">Migrate this EJB module's default datasource binding to a default CMP
-Connection Factory binding.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 "> </td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2875E </td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 "><ejb-client-jar> {0} must exist in every EAR file
-that contains this EJB module.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">If <samp class="codeph"><ejb-client-jar></samp> is specified
-in <span class="filepath">ejb-jar.xml</span>, a corresponding EJB client project must
-contain the home and remote interfaces and any other types that a client will
-need. If these types are all contained in a single EJB project, delete the <samp class="codeph"><ejb-client-jar></samp> line
-in the deployment descriptor. Otherwise, ensure that the EJB client project
-exists, is open, and is a project utility JAR in every EAR that uses this
-EJB project as a module.</td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ2905</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">The EJB validator did not run because ejb-jar.xml could not be loaded.
-Run the XML validator for more information.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">CHKJ2905 means that the project's metadata could not be initialized
-from ejb-jar.xml. <ol><li>Ensure the following: <ul><li>that the META-INF folder exists in the EJB project</li>
-<li>that META-INF contains ejb-jar.xml</li>
-<li>that META-INF is in the project's classpath.</li>
-</ul>
- </li>
-<li>Validate the syntax of the ejb-jar.xml file: in the Navigator view, highlight
-the ejb-jar.xml file, right-click, and select <span class="uicontrol">Validate XML file</span>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol>
-</td>
-</tr>
-<tr><td colspan="3" valign="top" headers="d0e33 d0e35 d0e37 "><span class="uicontrol">JSP validator</span></td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">IWAW0482</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">No valid JspTranslator</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">There is a path problem with the project; the JSP Validator
-needs access to the WAS runtime code. If IWAW0482E appears on all web projects,
-check the Variable or JRE path: <ol><li>Check the global preferences (<span class="uicontrol">Window > Preferences > Java >Installed
-JREs</span>) and make sure that the location for the JRE is pointing
-to a valid JRE directory. </li>
-<li>Ensure that the classpath variables (<span class="uicontrol">Window > Preferences >
-Java > Classpath Variables</span>) are set correctly.</li>
-</ol>
- </td>
-</tr>
-<tr><td colspan="3" valign="top" headers="d0e33 d0e35 d0e37 "><span class="uicontrol">WAR validator</span></td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 ">CHKJ3008</td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">Missing or invalid WAR file.</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">The web.xml file cannot be loaded. The project metadata
-cannot be initialized from the web.xml file. <ol><li>Ensure the following: <ul><li>that the WEB-INF folder exists in the web project</li>
-<li>that WEB-INF contains the web.xml file</li>
-<li>that WEB-INF is in the project's classpath.</li>
-</ul>
- </li>
-<li>Validate the syntax of the web.xml file: in the Navigator view, highlight
-the web.xml file, right-click, and select <span class="uicontrol">Validate XML file</span>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol>
-</td>
-</tr>
-<tr><td colspan="3" valign="top" headers="d0e33 d0e35 d0e37 "><span class="uicontrol">XML validator</span></td>
-</tr>
-<tr><td valign="top" width="20.27027027027027%" headers="d0e33 "> </td>
-<td valign="top" width="24.324324324324326%" headers="d0e35 ">The content of element type "ejb-jar" is incomplete, it must match
-"(description?,display-name?,small-icon?,large-icon?,enterprise-beans,assembly-descriptor?,ejb-client-jar?)".</td>
-<td valign="top" width="55.4054054054054%" headers="d0e37 ">The EJB 1.1 and 2.0 specifications mandate that at least one enterprise
-bean must exist in an EJB .jar file. This error message is normal during development
-of EJB .jar files and can be ignored until you perform a production action,
-such as exporting or deploying code. Define at least one enterprise bean in
-the project.</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
deleted file mode 100644
index 2a7b973..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>J2EE Validators</title>
-</head>
-<body id="rvalidators"><a name="rvalidators"><!-- --></a>
-<h1 class="topictitle1">J2EE Validators</h1>
-<div><p>This table lists the validators that are available for the different
-project types and gives a brief description of each validator.</p>
-
-<div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" width="50%" id="d0e24">Validator name</th>
-<th valign="top" width="50%" id="d0e26">Description</th>
-</tr>
-</thead>
-<tbody><tr><td align="left" valign="top" width="50%" headers="d0e24 ">Application Client Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The Application Client Validator validates
-the following Application Client project resources: <ul><li>Deployment descriptor (application-client.xml)</li>
-<li>EJB references</li>
-<li>Resource references</li>
-</ul>
-</td>
-</tr>
-<tr><td valign="top" width="50%" headers="d0e24 ">Connector Validator</td>
-<td valign="top" width="50%" headers="d0e26 ">The Connector validator checks for invalid J2EE specification
-levels in connector projects.</td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">DTD Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The DTD validator determines whether the
-current state of a DTD is semantically valid. XML files are validated according
-to the XML specification <a href="http://www.w3.org/TR/2000/REC-xml-20001006" target="_blank"> Extensible Markup Language (XML) 1.0</a> from the W3C
-Web site. As well, the DTD validator checks for errors such as references
-to entities and elements that do not exist.</td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">EAR Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The EAR Validator validates the following:
- <ul><li>EAR deployment descriptor (application.xml)</li>
-<li>EJB references of all module projects in the enterprise application project</li>
-<li>Security roles</li>
-<li>Resource references</li>
-<li>Manifest files for all contained or referenced modules and utility JAR
-files</li>
-<li>Target server consistency between the enterprise application project and
-any utility and module projects</li>
-<li>Existence of projects for each module defined in enterprise application</li>
-</ul>
- <p>Note that the EAR Validator only ensures the validity and dependency
-of the module projects with respect to the enterprise application project.</p>
-</td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">EJB Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The EJB Validator verifies that enterprise
-beans contained in an EJB project comply with the Sun Enterprise JavaBeans™ Specifications
-(1.1, 2.0, and 2.1), depending on the level of the bean. Code validation for
-the EJB 1.0 specification is not supported. <p>Specifically, the EJB Validator
-validates the following resources: </p>
- <ul><li>Java™ .class
-files that are members of an enterprise bean (home interface, remote interface,
-enterprise bean class, and, if the bean is an entity bean, the key class)</li>
-<li>ejb-jar.xml</li>
-</ul>
-</td>
-</tr>
-<tr><td valign="top" width="50%" headers="d0e24 ">EL Syntax Validator</td>
-<td valign="top" width="50%" headers="d0e26 "> </td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">HTML Syntax Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The HTML Syntax Validator validates HTML
-basic syntax and HTML DTD compliance in the following Web project resources:
- <ul><li>HTML files</li>
-<li>JSP files</li>
-</ul>
-</td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">JSP Syntax Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The JSP Syntax Validator validates JSP files
-in a project by translating them into the corresponding Java code
-and then checking the Java code for compile errors.</td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">War Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The War Validator validates the following
-web project resources: <ul><li>Deployment descriptor (web.xml)</li>
-<li>Servlets</li>
-<li>Security roles</li>
-<li>Servlet & servlet mappings</li>
-<li>EJB references</li>
-</ul>
-</td>
-</tr>
-<tr><td valign="top" width="50%" headers="d0e24 ">WSDL Validator</td>
-<td valign="top" width="50%" headers="d0e26 ">The WSDL validator checks the following in WSDL files: <ul><li>XML syntax</li>
-<li>XML Schema types in the <types> section</li>
-<li>Referential integrity of the various constructs in WSDL </li>
-</ul>
-The validator also includes an extension point to allow other validators
-to be plugged into the WSDL validation to provide additional verification
-of the WSDL file. Through this mechanism, interoperability is checked by validating
-a WSDL file against WS-I Profiles. </td>
-</tr>
-<tr><td valign="top" width="50%" headers="d0e24 ">WS-I Message Validator</td>
-<td valign="top" width="50%" headers="d0e26 ">WS-I Message validator checks SOAP messages against
-WS-I Profiles. A user can capture and verify SOAP messages using the TCP/IP
-Monitor. The validator checks a message log that is saved as a project resource
-(.wsimsg). The log conforms to a format as specified by WS-I.</td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">XML Schema Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The XML schema validator determines whether
-the current state of an XML schema file is semantically valid. XML schemas
-are validated according to the XML Schema specification <a href="http://www.w3.org/TR/xmlschema-1/"> XML Schema Part 1:
-Structures</a> from the W3C Web site.</td>
-</tr>
-<tr><td align="left" valign="top" width="50%" headers="d0e24 ">XML Validator</td>
-<td align="left" valign="top" width="50%" headers="d0e26 ">The XML validator ensures that an XML file
-is well-formed. It also verifies if an XML file is valid - that is, it follows
-the constraints established in the DTD or XML schema the XML file is associated
-with.</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="You may encounter these common error messages when you validate your projects.">Common validation errors and solutions</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
deleted file mode 100644
index 5ec8be3..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Adding a facet to a J2EE project</title>
-</head>
-<body id="taddingfacet"><a name="taddingfacet"><!-- --></a>
-<h1 class="topictitle1">Adding a facet to a J2EE project</h1>
-<div><div>This topic explains how to add a facet to an existing project in
-your workspace.</div><div class="section">Facets define characteristics and requirements for projects. When
-you add a facet to a project, that project is configured to perform a certain
-task, fulfill certain requirements, or have certain characteristics. For example,
-the EAR facet sets up a project to function as an enterprise application by
-adding a deployment descriptor and setting up the project's classpath.<p>New
-projects generally have facets added to them when they are created. To add
-another facet to a project that already exists, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Project Explorer view, right-click the project and then
-click <span class="uicontrol">Properties</span>.</span></li>
-<li class="stepexpand"><span>In the Properties window, click <span class="uicontrol">Project Facets</span>.</span> The Project Facets page lists the facets in the project. </li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Add/Remove Project Facets</span>.</span></li>
-<li class="stepexpand"><span>In the Add/Remove Project Facets window, select the check boxes
-next to the facets you want this project to have and select a version number
-for each facet.</span> You can also choose a preset combination of facets
-from the <span class="uicontrol">Presets</span> list, and you can find out more about
-the requirements for each facet by right-clicking the facet name and then
-clicking <span class="uicontrol">Show Constraints</span>.</li>
-<li class="stepexpand"><span>If you want to limit the project so it will be compatible with
-one or more runtimes, click the <span class="uicontrol">Show Runtimes</span> button
-and select the runtimes that you want the project to be compatible with.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjrar.html" title="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).">Creating a connector project</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
deleted file mode 100644
index 351e359..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Creating an application client project</title>
-</head>
-<body id="tjappproj"><a name="tjappproj"><!-- --></a>
-<h1 class="topictitle1">Creating an application client project</h1>
-<div><div>You can use a wizard to create a new application client project
-and add it to a new or existing enterprise application project.</div><div class="section"> <p>Application client projects contain the resources needed for
-application client modules. Application client projects contain programs that
-run on networked client systems. An application client project is deployed
-as a JAR file.</p>
-<p>Like the other types of projects, application client
-projects can contain one or more project facets, which represent units of
-functionality in the project. A new application client project should have
-the Application Client module facet. Depending on what you want to use the
-project for, you may want to enable other facets for the project.</p>
-<p>To
-create a J2EE application client project:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Application Client Project</span></span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for the application
-client project. </span></li>
-<li class="stepexpand"><span>To change the default project location, clear the <span class="uicontrol">Use
-default</span> check box under <span class="uicontrol">Project contents</span> and
-select a new location with the <span class="uicontrol">Browse</span> button.</span> If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<div class="note"><span class="notetitle">Note:</span> If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span></li>
-<li class="stepexpand"><span>If you want to add the new project to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and select a project in the <span class="uicontrol">EAR Project Name</span> list.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Select the check boxes next to the facets you want this project
-to have and select a version number for each facet. </span> You can also
-choose a preset combination of facets from the <span class="uicontrol">Presets</span> list,
-and you can find out more about the requirements for each facet by right-clicking
-the facet name and then clicking <span class="uicontrol">Show Constraints</span>.</li>
-<li class="stepexpand"><span>If you want to limit your project so it will be compatible with
-one or more runtimes, click the <span class="uicontrol">Show Runtimes</span> button
-and select the runtimes that you want the project to be compatible with.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Source Folder</span> field, enter the name
-of the folder to use for source code. </span></li>
-<li class="stepexpand"><span>If you want to create a default class for the module, select the <span class="uicontrol">Create
-a default Main class</span> check box.</span> </li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a J2EE project</a></div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
deleted file mode 100644
index 05a1cf6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Correcting cyclical dependencies after an EAR is imported</title>
-</head>
-<body id="tjcircleb"><a name="tjcircleb"><!-- --></a>
-<h1 class="topictitle1">Correcting cyclical dependencies after an EAR is imported</h1>
-<div><p>You can resolve cyclical dependencies after an EAR is imported.</p>
-<div class="section">A cyclical dependency between two or more modules in an enterprise
-application most commonly occurs when projects are imported from outside the
-workbench. When a cycle exists between two or more modules in an enterprise
-application, the Java™ builder cannot accurately compute the build order
-of the projects. Full builds fail under these conditions, or require several
-invocations.<p>Therefore, the best practice is to organize your projects or
-modules into components. This allows your module dependencies to function
-as a tree instead of a cycle diagram. This practice has the added benefit
-of producing a better factored and layered application.</p>
-</div>
-<ol><li><span>Identify all the classes within the JAR files that have cyclical
-dependencies, then move those classes into a common Java project
-or JAR file.</span></li>
-<li><span>Use the enterprise application editor to map utility JAR files
-to the common projects.</span></li>
-<li><span>Use the JAR dependency editor or properties page, for each module
-of the JAR in the application, to set dependencies only to the JAR files that
-are truly required.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjcircle.html">Cyclical dependencies between J2EE modules</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
deleted file mode 100644
index 9626ee7..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Creating an enterprise application project</title>
-</head>
-<body id="tjear"><a name="tjear"><!-- --></a>
-<h1 class="topictitle1">Creating an enterprise application project</h1>
-<div><div class="section"><p>Enterprise application projects contain references to the resources
-needed for enterprise applications and can contain a combination of Web modules,
-JAR files, connector modules, EJB modules, and application client modules.
-An enterprise application project is deployed in the form of an EAR file,
-and is therefore sometimes referred to as an EAR project. The modules in an
-enterprise application project are mapped to other J2EE projects. The mapping
-information is stored in metadata files within the enterprise application
-project. The metadata files are used for exporting the project to an EAR file
-and for running the project on the server.</p>
-<p>Like the other types of projects,
-enterprise application projects can contain one or more project facets, which
-represent units of functionality in the project. To be deployed as an EAR
-file, the new project must have the EAR facet. Depending on what you want
-to use the project for, you may want to enable other facets for the project.</p>
-<p>When you create an enterprise
-application project, it is recommended that you do not give it a name that
-contains double-byte character set (DBCS) characters.</p>
-<p>To
-create a J2EE enterprise application project:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Enterprise Application Project</span></span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for the new
-project. </span></li>
-<li class="stepexpand"><span>To change the default project location, clear the <span class="uicontrol">Use
-default</span> check box under <span class="uicontrol">Project contents</span> and
-select a new location with the <span class="uicontrol">Browse</span> button.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Select the check boxes next to the facets you want this project
-to have and select a version number for each facet. </span> You can also
-choose a preset combination of facets from the <span class="uicontrol">Presets</span> list,
-and you can also find out more about the requirements for each facet by right-clicking
-the facet name and then clicking <span class="uicontrol">Show Constraints</span>.</li>
-<li class="stepexpand"><span>If you want to limit your project so it will be compatible with
-one or more runtimes, click the <span class="uicontrol">Show Runtimes</span> button
-and select the runtimes that you want the project to be compatible with.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>On the J2EE Modules to Add to the EAR page of the wizard, select
-the existing modules that you want to add to the new enterprise application
-project. </span></li>
-<li class="stepexpand"><span>You can also create new modules to add to the project:</span><ol type="a"><li class="substepexpand"><span>Click the <span class="uicontrol">New Module</span> button.</span></li>
-<li class="substepexpand"><span>If you want to create one module, clear the <span class="uicontrol">Create
-default modules</span> check box, select the type of module you want
-to create, click <span class="uicontrol">Next</span> and follow the New Project wizard
-for that type of project.</span></li>
-<li class="substepexpand"><span>If you want to create more than one module, select the <span class="uicontrol">Create
-default modules</span> check box, select the check boxes for each type
-of project you want to create, and click <span class="uicontrol">Finish</span>. </span> You can enter a name for each module. Each of these modules will have
-the default settings for that type of project and they will have the same
-server target as the new enterprise application.</li>
-</ol>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a J2EE project</a></div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
deleted file mode 100644
index c49cbaf..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Exporting an application client project</title>
-</head>
-<body id="tjexpapp"><a name="tjexpapp"><!-- --></a>
-<h1 class="topictitle1">Exporting an application client project</h1>
-<div><p>You can export an application client project as a JAR file.</p>
-<div class="section"><p>To export an application client project from the workbench:</p>
-</div>
-<ol><li><span>In the Project Explorer view of the J2EE perspective, right-click
-the application client project that you want to export.</span></li>
-<li><span>Select <span class="menucascade"><span class="uicontrol">Export</span> > <span class="uicontrol">App
-Client JAR file</span></span> from the pop-up menu. The Export
-wizard opens.</span></li>
-<li><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and JAR file name where you want to export the application client project
-that is selected in the <span class="uicontrol">Application Client project</span> field.</span></li>
-<li><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-<li><strong>Optional: </strong><span>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select <span class="uicontrol">Overwrite
-existing files without warning</span>.</span></li>
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
deleted file mode 100644
index d5ed8d9..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Exporting an enterprise application into an EAR file</title>
-</head>
-<body id="tjexpear"><a name="tjexpear"><!-- --></a>
-<h1 class="topictitle1">Exporting an enterprise application into an EAR file</h1>
-<div><p>Enterprise applications are deployed in the form of an EAR file.
-Use the Export wizard to export an enterprise application project into an
-EAR file for deployment.</p>
-<div class="section"> <p>To export an enterprise application project into an EAR file:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Project Explorer view of the J2EE perspective, right-click
-the project that you want to export.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Export</span> from the pop-up menu. The Export
-wizard opens.</span></li>
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="uicontrol">EAR
-file</span>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR Application</span> list, select the
-project to export.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and EAR file name where you want to export the enterprise application
-project that is selected in the <span class="uicontrol">EAR application</span> field.</span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>If you are exporting to an existing EAR file
-and you do not want to be warned about overwriting it, select <span class="uicontrol">Overwrite
-existing files without warning</span></span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>Select <span class="uicontrol">Include project build paths
-and meta-data files</span>.</span> This allows you to preserve the
-original names of projects included in or referenced by the application project,
-for re-importing the EAR in another workspace. </li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="section">The wizard exports the contents of the EAR project to the specified
-EAR file. Additionally, for each project that corresponds to a module or utility
-JAR in the application, the project contents are exported into a nested module
-or JAR file in the EAR file. If any unsaved changes exist on any of the files
-in any of the referenced projects, you are prompted to save these files prior
-to export.</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project contains the hierarchy of resources that are required to deploy a J2EE enterprise application, often referred to as an EAR file.">Enterprise application projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html
deleted file mode 100644
index 6a1bf75..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Exporting connector projects to RAR files</title>
-</head>
-<body id="tjexprar"><a name="tjexprar"><!-- --></a>
-<h1 class="topictitle1">Exporting connector projects to RAR files</h1>
-<div><p>You can export a connector project to a RAR file in preparation
-for deploying it to a server.</p>
-<div class="section"> <p>To export the contents of a connector project to
-a RAR file:</p>
-</div>
-<ol><li><span>In the Project Explorer view of the J2EE perspective, right-click
-the connector project that you want to export and click <span class="uicontrol">Export</span>.</span></li>
-<li><span>In the Export window, click <span class="uicontrol">RAR file</span>.</span></li>
-<li><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li><span>In the <span class="uicontrol">Connector module</span> list, select the
-name of the connector project to export.</span></li>
-<li><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and RAR file name where you want to export the module that is selected
-in the <span class="uicontrol">Connector project</span> field.</span></li>
-<li><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-<li><strong>Optional: </strong><span>If you are exporting to an existing RAR file
-and you do not want to be warned about overwriting it, select <span class="uicontrol">Overwrite
-existing file</span></span></li>
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="section"> The wizard exports the contents of the RAR project to the specified
-RAR file.</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
deleted file mode 100644
index e7c4fcc..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Importing an application client JAR file</title>
-</head>
-<body id="tjimpapp"><a name="tjimpapp"><!-- --></a>
-<h1 class="topictitle1">Importing an application client JAR file</h1>
-<div><p>Application client projects are deployed as JAR files. You can
-import an application client project that has been deployed into a JAR file
-by using the Import wizard.</p>
-<div class="section"> <p>To import an application client JAR file using the wizard:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">Import</span></span>. The Import window opens.</span></li>
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="uicontrol">App
-Client Jar file</span>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Application Client file</span> field, enter
-the location and name of the application client JAR file that you want to
-import. Click the <span class="uicontrol">Browse</span> button to select the JAR file
-from the file system.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Application Client project</span> field,
-type a new project or select an application client project from the drop-down
-list. Or, click the <span class="uicontrol">New</span> button to launch the New Application
-Client Project wizard. If you type a new name in this field, the application
-client project will be created based on the version of the application client
-JAR file, and it will use the default location. Use the <span class="uicontrol">New</span> button
-to change the J2EE version and the location.</span></li>
-<li class="stepexpand"><span>If you are importing to an existing project, select <span class="uicontrol">Overwrite
-existing resources without warning</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Target server</span> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the run time settings by modifying the class path entries
-for the project.</span></li>
-<li class="stepexpand"><span>Specify whether you want to add the new module to an enterprise
-application (EAR) project.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR application</span> field, type a new
-project name or select an existing enterprise application project from the
-drop-down list. Or, click the <span class="uicontrol">New</span> button to launch
-the New Enterprise Application Project wizard.</span> <div class="note"><span class="notetitle">Note:</span> If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the application client
-JAR file.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
deleted file mode 100644
index 96890d6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing an enterprise application EAR file</title>
-</head>
-<body id="tjimpear"><a name="tjimpear"><!-- --></a>
-<h1 class="topictitle1">Importing an enterprise application EAR file</h1>
-<div><p>Enterprise application projects are deployed into EAR files. You
-can import an enterprise application project by importing it from a deployed
-EAR file.</p>
-<div class="section"> <p>You can also choose to import utility JAR files as utility Java™ projects.
-You can also use the wizard to change the new project names for the EAR file
-and modules that will be imported.</p>
-<p>To import an EAR file using the wizard:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">Import</span></span>. The Import window opens.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">EAR file</span>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Specify the following general options for the EAR import:</span> <ol type="a"><li><span><span class="uicontrol">EAR file</span>: Enter the full path for the
-EAR file that you want to import. You can click <span class="uicontrol">Browse</span> to
-select the EAR file from the file system.</span></li>
-<li><span><span class="uicontrol">EAR project</span>: type a name for the enterprise
-application project that will be created when you import the EAR file.</span></li>
-<li><span><span class="uicontrol">Target runtime</span>: Select the application
-server that you want to target for your development. This selection affects
-the runtime settings by modifying the class path entries for the project.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>, and complete the following steps:</span><ol type="a"><li><span>On the Enterprise Application Import page, select any utility
-JAR files from the project that you want to import as utility projects.</span></li>
-<li><span>In the <span class="uicontrol">Module Root Location field</span>, specify
-the root directory for all of the projects that will be imported or created
-during import.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>On the EAR Module and Utility JAR Projects page of the wizard,
-select the projects that you want to import with the EAR file. Also, you can
-edit the new project name for each module and utility project to be imported.</span> <div class="tip"><span class="tiptitle">Tip:</span> The selection buttons on this page can help you select
-the projects to import when you are importing for partial EAR development.
-For example, if you are importing to a workspace where some projects are attached
-to a repository and other projects are in binary form, these buttons help
-you make the proper selections for which projects to import:<ul><li><span class="uicontrol">Select New</span>: Selects the projects that are currently
-not in your workspace.</li>
-<li><span class="uicontrol">Select All</span>: Selects all projects for import.</li>
-<li><span class="uicontrol">Deselect All</span>: Clears all module and utility projects
-for import.</li>
-</ul>
-</div>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the contents of the
-EAR file.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project contains the hierarchy of resources that are required to deploy a J2EE enterprise application, often referred to as an EAR file.">Enterprise application projects</a></div>
-<div><a href="../topics/cjcircle.html">Cyclical dependencies between J2EE modules</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html
deleted file mode 100644
index f04914c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Importing a connector project RAR file</title>
-</head>
-<body id="tjimprar"><a name="tjimprar"><!-- --></a>
-<h1 class="topictitle1">Importing a connector project RAR file</h1>
-<div><p>Connector projects are deployed into RAR files. You can import
-a connector project by importing a deployed RAR file.</p>
-<div class="section"><p>To import a connector project RAR file using the wizard:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">Import</span></span>. The Import window opens.</span></li>
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="uicontrol">RAR
-file</span>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector file</span> field, enter the full
-path and name of the connector RAR file that you want to import. Click the <span class="uicontrol">Browse</span> button
-to select the RAR file from the file system.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector module</span> combination box,
-type a new project name or select a connector project from the drop-down list.
-If you type a new project name in this field, the connector project will be
-created based on the version of the connector RAR file, and it will use the
-default location.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the run time settings by modifying the class path entries
-for the project.</span></li>
-<li class="stepexpand"><span>If you want to add the new connector module to an enterprise application
-(EAR) project, select the <span class="uicontrol">Add module to an EAR application</span> check
-box.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR application</span> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <span class="uicontrol">New</span> button to
-launch the New Enterprise Application Project wizard.</span> <div class="note"><span class="notetitle">Note:</span> If
-you type a new EAR project name, the EAR project will be created in the default
-location with the lowest compatible J2EE version based on the version of the
-project being created. If you want to specify a different version or a different
-location for the enterprise application, you must use the New
-Enterprise Application Project wizard.</div>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the connector RAR
-file.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
deleted file mode 100644
index 3c24ce2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Creating a connector project</title>
-</head>
-<body id="tjrar"><a name="tjrar"><!-- --></a>
-<h1 class="topictitle1">Creating a connector project</h1>
-<div><div>A connector is a J2EE standard extension mechanism for containers
-to provide connectivity to enterprise information systems (EISs).</div><div class="section"> <p> A connector is a J2EE standard extension mechanism for containers
-to provide connectivity to enterprise information systems (EISs). A connector
-is specific to an EIS and consists of a resource adapter and application development
-tools. A resource adapter is a system-level software driver that is used by
-an EJB container or an application client to connect to an EIS. Connectors
-comply with the J2EE Connector architecture (JCA).</p>
-<p>Like the other types
-of projects, connector projects can contain one or more project facets, which
-represent units of functionality in the project. A new application client
-project should have the J2C Module facet. Depending on what you want to use
-the project for, you may want to enable other facets for the project.</p>
-<div class="restriction"><span class="restrictiontitle">Restriction:</span> J2EE 1.2 specification level does not include connector
-capability.</div>
-<p>To create a new connector project:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, select <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Connector Project</span></span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for the connector
-project. </span></li>
-<li class="stepexpand"><span>To change the default project location, clear the <span class="uicontrol">Use
-default</span> check box under <span class="uicontrol">Project contents</span> and
-select a new location with the <span class="uicontrol">Browse</span> button.</span> If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<div class="note"><span class="notetitle">Note:</span> If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span></li>
-<li class="stepexpand"><span>If you want to add the new project to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and select a project in the <span class="uicontrol">EAR Project Name</span> list.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Select the check boxes next to the facets you want this project
-to have and select a version number for each facet. </span> You can also
-choose a preset combination of facets from the <span class="uicontrol">Presets</span> list,
-and you can find out more about the requirements for each facet by right-clicking
-the facet name and then clicking <span class="uicontrol">Show Constraints</span>.</li>
-<li class="stepexpand"><span>If you want to limit your project so it will be compatible with
-one or more runtimes, click the <span class="uicontrol">Show Runtimes</span> button
-and select the runtimes that you want the project to be compatible with.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Source Folder</span> field, enter the name
-of the folder to use for source code. </span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a J2EE project</a></div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
deleted file mode 100644
index 32f0fd8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Specifying target servers for J2EE projects</title>
-</head>
-<body id="tjtargetserver"><a name="tjtargetserver"><!-- --></a>
-<h1 class="topictitle1">Specifying target servers for J2EE projects</h1>
-<div><p>When you develop J2EE applications, the workbench requires that
-you specify the server runtime environments for your J2EE projects. The target
-server is specified during project creation and import, and it can be changed
-in the project properties. The target server setting is the default mechanism
-for setting the class path for J2EE projects.</p>
-<div class="section"><p>In order to support different application servers that use different
-JDK levels for their Java™ Runtime Environment (JRE), the workbench
-requires that projects include a target server setting. For example, if you
-want to take advantage of the features of JDK 1.4.2, your applications require
-different class path entries than those that were used in previous versions
-of the workbench. By requiring that you specify a target server, the workbench
-enforces that proper entries are appropriately added for running on the server
-you choose.</p>
-<p>When the project is created, the class path of the project
-is updated with two class path containers. One container is the JDK container
-and the other is the server container. The JDK container points to the directory
-that contains the JAR files that are necessary to support the JDK version.
-The server container points to the directory that contains the multiple public
-JAR files available in the selected server. The project then compiles based
-on the required JAR files located in these folders, and you do not need to
-worry about adding additional JAR files from the server during development.
-When the project is compiled, the JAR files are included in the class path.
-You can still add your own JAR files to the class path.</p>
-<p>The target runtime
-environment is specified in the .runtime file in the project's resources.
-You should not edit this file manually.</p>
-<p>All J2EE project creation and
-import wizards require you to specify the target server for the resulting
-projects. The list of target servers that you can choose from is filtered
-based on installed runtimes, the J2EE level of the application, and the J2EE
-module type. For example, for EJB projects only application servers that support
-Enterprise JavaBeans™ are displayed. All projects inside a
-single EAR file must be targeted to the same server. If you create a new project
-and add it to an existing EAR project during creation, the project inherits
-the target server setting of the EAR project.</p>
-<div class="note"><span class="notetitle">Note:</span> Utility Java projects
-that are added to an application are targeted to the same target server as
-the application. Web library projects that are added to a Web project are
-targeted to the same target server as the Web project.</div>
-<p>To modify
-the target runtime and default server for an existing project:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Project Explorer view of the J2EE perspective, right-click
-the enterprise application or module project, and select <span class="uicontrol">Properties</span> from
-the pop-up menu.</span> The Properties dialog for the project opens.</li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">Server</span> page on the Properties
-dialog.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the server runtime that you want your project to be developed for. This selection
-impacts the runtime libraries that are added to your project class path. You
-can click <span class="uicontrol">New</span> to define a new runtime environment that
-you have installed. The list of runtime environments are defined in your workbench
-preferences.</span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>Enterprise applications only: When modifying
-the target server for an enterprise application, you can select the <span class="uicontrol">Include
-child projects</span> check box to apply your changes to any children
-modules.</span> This ensures that the enterprise application project
-and all of its module projects, utility projects, and Web application library
-projects have the same target server.</li>
-<li class="stepexpand"><strong>Optional: </strong><span>In the <span class="uicontrol">Default server</span> field,
-select a default server to use when deploying the project. Although you would
-typically set this to the same value as the target runtime, the <span class="uicontrol">Default
-server</span> selection is independent of the <span class="uicontrol">Target runtime</span> selection.
-The default server simply specifies a project preference so you are not prompted
-for available runtime environments when you deploy the project.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> to save your changes.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise services.">J2EE architecture</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
deleted file mode 100644
index 3c24d0d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Validating code in enterprise applications</title>
-</head>
-<body id="tjval"><a name="tjval"><!-- --></a>
-<h1 class="topictitle1">Validating code in enterprise applications</h1>
-<div><div class="section"> <p>The workbench provides manual code validation, code validation
-during a build, and automatic code validation of project resources. Manual
-code validation is explicitly invoked by the user, and it immediately validates
-the resources contained in a selected project. Build validation occurs when
-you manually invoke a build. Automatic code validation occurs whenever an
-automatic incremental build occurs as a result of a resource change, such
-as when a project is created, a .java file is edited, or a model file (such
-as ejb-jar.xml, .mapxmi, or .rdbxmi) is changed or saved. By
-default, manual code validation and automatic code validation are enabled
-in the preferences.</p>
-<p>On the Properties page for each enterprise application
-module project, you will find a list of validators that you can run against
-a selected project. The list of validators is different for each type of project. </p>
-<p>For
-more information about validation, see the following topics:</p>
-</div>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/rvalerr.html">Common validation errors and solutions</a></strong><br />
-You may encounter these common error messages when you validate
-your projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/rvalidators.html">J2EE Validators</a></strong><br />
-This table lists the validators that are available for the different
-project types and gives a brief description of each validator.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalauto.html">Enabling automatic code validation</a></strong><br />
-If you want validation to occur automatically during an automatic
-incremental build that occurs as a result of a resource change, you can enable
-automatic code validation.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalbuild.html">Enabling build validation</a></strong><br />
-You can enable validation to occur during a build of a project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvaldisable.html">Disabling a validator</a></strong><br />
-You can disable one or more validators for a project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalglobalpref.html">Overriding global validation preferences</a></strong><br />
-For a given project, you can override the global validation preferences.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalmanual.html">Manually validating code</a></strong><br />
-When you run a manual validation, all resources in the selected
-project are validated with the validators that are selected on the Validation
-page of the project Properties dialog.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalselect.html">Selecting code validators</a></strong><br />
-You can select specific validators to run for a project during
-manual and automatic code validation.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE Applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="You may encounter these common error messages when you validate your projects.">Common validation errors and solutions</a></div>
-<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalauto.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalauto.html
deleted file mode 100644
index 32facb4..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalauto.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Enabling automatic code validation</title>
-</head>
-<body id="tjvalauto"><a name="tjvalauto"><!-- --></a>
-<h1 class="topictitle1">Enabling automatic code validation</h1>
-<div><p>If you want validation to occur automatically during an automatic
-incremental build that occurs as a result of a resource change, you can enable
-automatic code validation.</p>
-<div class="section"> <p>You can enable automatic code validation for all projects in
-your workspace or for only the ones you select.</p>
-<p></p>
-</div>
-<ol><li><span>On the workbench menu bar, click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span>. The Preferences window opens.</span></li>
-<li><span>Click <span class="uicontrol">Validation</span> on the left pane of the
-window. This page lists validation options for your entire workspace.</span></li>
-<li><span>Select the <span class="uicontrol">Run validation automatically when you save
-changes to a resource</span> check box.</span></li>
-<li><span>If you want to allow individual projects to have different validation
-settings, select the <span class="uicontrol">Allow projects to override these preference
-settings</span> check box.</span></li>
-<li><span>Choose the validators that you want to use by selecting or clearing
-the check boxes next to the list of validators.</span></li>
-<li><span>Click <span class="uicontrol">OK</span>. Now, your projects will be validated
-automatically when they are changed.</span></li>
-<li><span>If you want to set different automatic validation
-settings for specific projects, follow these steps:</span><ol type="a"><li><span>In the Project Explorer view, right-click a project and click <span class="uicontrol">Properties</span>.
-The Properties window opens.</span></li>
-<li><span>Click <span class="uicontrol">Validation</span> on the left pane of
-the window. This page lists validation options for the project.</span></li>
-<li><span>On the Validation page, select the <span class="uicontrol">Override validation
-preferences</span> check box.</span></li>
-<li><span>If you want this project to be validated automatically when
-you make changes, select the <span class="uicontrol">Run validation automatically when
-you make changes to <var class="varname">project_name</var> resources</span> check
-box.</span></li>
-<li><span>Choose the validators that you want to use by selecting or clearing
-the check boxes next to the list of validators.</span></li>
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</li>
-</ol>
-<div class="section"> <p>If any errors are detected, an error or warning message is logged
-in the Problems view. These messages cannot be removed manually. Once the
-problem is fixed that caused the messages to be generated, the messages are
-automatically removed. You can, however, use the Filter Tasks wizard to temporarily
-filter out any messages in the Problems view until you can fix the associated
-problems. To open the Filter Tasks wizard, click the Filters icon in the title
-bar of the Problems view. Alternatively, if you do not want to see any problems
-detected by a particular validator, on a particular project, you can disable
-the validator in the project's Properties page. When a validator is disabled,
-all messages from that validator are removed.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalbuild.html" title="You can enable validation to occur during a build of a project.">Enabling build validation</a></div>
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators for a project.">Disabling a validator</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated with the validators that are selected on the Validation page of the project Properties dialog.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run for a project during manual and automatic code validation.">Selecting code validators</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalbuild.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalbuild.html
deleted file mode 100644
index c2c6d80..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalbuild.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Enabling build validation</title>
-</head>
-<body id="tjvalbuild"><a name="tjvalbuild"><!-- --></a>
-<h1 class="topictitle1">Enabling build validation</h1>
-<div><p>You can enable validation to occur during a build of a project.</p>
-<div class="section"> <p>Build validation occurs when you select either <span class="uicontrol">Build
-Project</span>, <span class="uicontrol">Build All</span>, <span class="uicontrol">Rebuild
-Project</span>, or <span class="uicontrol">Rebuild All</span>. These build options
-appear in a pop-up menu only if automatic builds are disabled. Each of the
-build commands starts an incremental build of the project or workspace. The
-incremental build validates the project using the validators that are enabled
-for the project. The incremental build also validates any projects that are
-referenced by the project being validated, using the validators that are enabled
-for each respective project. The rebuild commands start a full build (all
-previous build output is deleted and everything is recreated).</p>
-<p>To enable
-build validation: </p>
-</div>
-<ol><li><span>In the Project Explorer view, right-click your project and select <span class="uicontrol">Properties</span>.</span></li>
-<li><span>On the <span class="uicontrol">Validation</span> page, select the <span class="uicontrol">Override
-validation preferences</span> check box to override global preferences
-for this project.</span></li>
-<li><span>Ensure that the validators that you want to run are selected.</span></li>
-<li><span>Select the <span class="uicontrol">Run validation when you manually
-build <project_name></span> check box. </span></li>
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalauto.html" title="If you want validation to occur automatically during an automatic incremental build that occurs as a result of a resource change, you can enable automatic code validation.">Enabling automatic code validation</a></div>
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators for a project.">Disabling a validator</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated with the validators that are selected on the Validation page of the project Properties dialog.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run for a project during manual and automatic code validation.">Selecting code validators</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
deleted file mode 100644
index 310b0ba..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Disabling a validator</title>
-</head>
-<body id="tjvaldisable"><a name="tjvaldisable"><!-- --></a>
-<h1 class="topictitle1">Disabling a validator</h1>
-<div><p>You can disable one or more validators for a project.</p>
-<div class="section"> <p>Errors and warning messages are displayed in the Problems view
-when validation is run. To disable one or more validators for a project:</p>
-</div>
-<ol><li><span>In the Project Explorer view, right-click your project and select <span class="uicontrol">Properties</span>.</span></li>
-<li><span>On the <span class="uicontrol">Validation</span> page, select the <span class="uicontrol">Override
-validation preferences</span> check box to override global preferences
-for this project.</span></li>
-<li><span>Clear the check box next to the validators that you want to disable.</span></li>
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-<div class="section">Only those validators that are selected on the Properties page will
-run automatically, manually, or during a build.</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalauto.html" title="If you want validation to occur automatically during an automatic incremental build that occurs as a result of a resource change, you can enable automatic code validation.">Enabling automatic code validation</a></div>
-<div><a href="../topics/tjvalbuild.html" title="You can enable validation to occur during a build of a project.">Enabling build validation</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated with the validators that are selected on the Validation page of the project Properties dialog.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run for a project during manual and automatic code validation.">Selecting code validators</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
deleted file mode 100644
index 4bdc654..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Overriding global validation preferences</title>
-</head>
-<body id="tjvalglobalpref"><a name="tjvalglobalpref"><!-- --></a>
-<h1 class="topictitle1">Overriding global validation preferences</h1>
-<div><p>For a given project, you can override the global validation preferences.</p>
-<div class="section"> <p>The default validation preferences are specified globally on
-the Validation page of the Preferences dialog. To allow projects to override
-these default validation preferences:</p>
-</div>
-<ol><li><span>On the workbench menu, click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span>.</span></li>
-<li><span>On the Validation page of the Preferences dialog, make sure that
-the <span class="uicontrol">Allow projects to override these preference settings</span> is
-selected.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalauto.html" title="If you want validation to occur automatically during an automatic incremental build that occurs as a result of a resource change, you can enable automatic code validation.">Enabling automatic code validation</a></div>
-<div><a href="../topics/tjvalbuild.html" title="You can enable validation to occur during a build of a project.">Enabling build validation</a></div>
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators for a project.">Disabling a validator</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated with the validators that are selected on the Validation page of the project Properties dialog.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run for a project during manual and automatic code validation.">Selecting code validators</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
deleted file mode 100644
index ca1e0f8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Manually validating code</title>
-</head>
-<body id="tjvalmanual"><a name="tjvalmanual"><!-- --></a>
-<h1 class="topictitle1">Manually validating code</h1>
-<div><p>When you run a manual validation, all resources in the selected
-project are validated with the validators that are selected on the Validation
-page of the project Properties dialog.</p>
-<div class="section"><p>To manually invoke an immediate code validation:</p>
-</div>
-<ol><li class="stepexpand"><span>Select the project that you want to validate.</span></li>
-<li class="stepexpand"><span>Right-click the project and select <span class="uicontrol">Run Validation</span>.</span> If no validators were selected, a message box provides information about
-how to select a validator.</li>
-</ol>
-<div class="section">Validation of the project is performed using the selected validators
-for the project.</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalauto.html" title="If you want validation to occur automatically during an automatic incremental build that occurs as a result of a resource change, you can enable automatic code validation.">Enabling automatic code validation</a></div>
-<div><a href="../topics/tjvalbuild.html" title="You can enable validation to occur during a build of a project.">Enabling build validation</a></div>
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators for a project.">Disabling a validator</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run for a project during manual and automatic code validation.">Selecting code validators</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
deleted file mode 100644
index 580dae6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-
-<title>Selecting code validators</title>
-</head>
-<body id="tjvalselect"><a name="tjvalselect"><!-- --></a>
-<h1 class="topictitle1">Selecting code validators</h1>
-<div><p>You can select specific validators to run for a project during
-manual and automatic code validation.</p>
-<div class="section"><p>To choose the validators that you want to use for a project:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Project Explorer view, right-click your project and select <span class="uicontrol">Properties</span>.</span></li>
-<li class="stepexpand"><span>On the <span class="uicontrol">Validation</span> page, select the <span class="uicontrol">Override
-validation preferences</span> check box to override global preferences
-for this project.</span></li>
-<li class="stepexpand"><span>Select the validators that you want to run. </span> <div class="note"><span class="notetitle">Note:</span> If
-you deselect any validator that is currently selected, any messages associated
-with the deselected validator will be removed from the task list.</div>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalauto.html" title="If you want validation to occur automatically during an automatic incremental build that occurs as a result of a resource change, you can enable automatic code validation.">Enabling automatic code validation</a></div>
-<div><a href="../topics/tjvalbuild.html" title="You can enable validation to occur during a build of a project.">Enabling build validation</a></div>
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators for a project.">Disabling a validator</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated with the validators that are selected on the Validation page of the project Properties dialog.">Manually validating code</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore b/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.project b/docs/org.eclipse.jst.j2ee.infopop/.project
deleted file mode 100644
index 63eb8c9..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <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>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/DeleteBean_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/DeleteBean_HelpContexts.xml
deleted file mode 100644
index 44455a7..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/DeleteBean_HelpContexts.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="com.ibm.wtp.generic.Delete">
- <!-- function scheduled for WTP 1.0 -->
-<description>Use this dialog box to specify the deletion options for the enterprise bean:
-
-- <b>Delete deployed code:</b> Select to delete the generated deployment code for the enterprise bean.
-- <b>Delete generated AccessBean:</b> Select to delete the access beans associated with the enterprise bean.
-- <b>Delete Bean from Deployment Descriptor:</b> Select to delete the bean entry from the deployment descriptor, but do not delete the bean.
-- <b>Delete Bean Classes:</b> Select to delete the classes associated with this bean.
-</description>
-</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
deleted file mode 100644
index 491320f..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-
-<!-- Page 1, Create an Enterprise Bean -->
-<context id="antejb1000">
-<description>Use this page to select the enterprise bean type: session bean or message-driven bean.
-
-You must install and enable XDoclet before creating a session or message-driven bean. Follow these steps:
- 1 - First, download and install XDoclet from http://xdoclet.sourceforge.net/xdoclet/install.html
- 2 - Next, click the <b>preferences</b> link to configure the XDoclet Runtime Preferences. Another way to get to the XDoclet Runtime Preferences page is from <b>Window > Preferences > J2EE Annotations > XDoclet</b>.
- 3 - Check the <b>Enable XDoclet Builder</b> check box.
- 4 - Select the Version of XDoclet that you have installed.
- 5 - Use the Browse button to locate the installation directory for XDoclet (<b>XDoclet Home</b>).
- 6 - Click <b>OK</b> to save the preferences.
-
-After installing and configuring XDoclet, select the bean type you want to create and click <b>Next</b>.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="EJB architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc annotation tagging -->
-</context>
-
-<!-- Page 2, Enterprise Bean class file definition -->
-<context id="antejb1100">
-<description>Enter the <b>Project</b>, <b>Module Name</b>, and workspace <b>Folder</b> for the new enterprise bean.
-
-Enter the <b>Java package</b> and <b>Class name</b> for the new enterprise bean.
-Change the <b>Superclass</b> if your class will override a class other than java.lang.Object.
-
-Select the <b>Generate an annotated bean class</b> check box to add J2EE annotations to the source file.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc annotation tagging -->
-</context>
-
-<!-- Page 3, Enterprise Bean details -->
-<context id="antejb1200">
-<description>Specify the EJB, JNDI and Display names for the enterprise bean.
- The <b>EJB name</b> is the name of the enterprise bean class.
- The <b>JNDI name</b> is a logical name used by the server to locate an enterprise bean at runtime.
- The <b>Display name</b> is a short name for the enterprise bean that is used by tools.
-
-Optionally, provide a text <b>Description</b> of the enterprise bean class.
-
-Select the <b>State Type</b> (stateless or stateful) if you are creating a session bean.
-A stateful session bean maintains client-specific session information, or conversational state, across multiple method calls and transactions.
-A stateless session bean does not maintain conversational state.
-
-Select the <b>Transaction Type</b> (container or bean) for the enterprise bean. This specifies whether the container or the bean will handle transaction demarcation.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-</context>
-
-<!-- Page 4, Enterprise Bean modifiers, interfaces and method stubs -->
-<context id="antejb1300">
-<description>Select the type of <b>Modifiers</b> for the bean class.
-
-Select the <b>Interfaces</b> that your bean class will implement. Use the <b>Add</b> and <b>Remove</b> buttons to create the list of interfaces.
-
-Select which method stubs that you want created in the bean class.<b></b>
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-</context>
-
-
-
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
deleted file mode 100644
index 5eb2558..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="APPCLIENT_EXPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to export an application client project into a JAR file. Select the application project to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file.
-</description>
-<!--topic label="Exporting an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-<context id="EAR_EXPORT_PAGE1">
-<description>Use this wizard to export an enterprise application project into an EAR file. Select the enterprise application project to export, and provide a directory and filename for the exported EAR file.
-
-Select <b>Export source files</b> to include source files in the EAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file.
-</description>
-<!--topic label="Exporting an enterprise application into an EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-<context id="EJB_EXPORT_PAGE1">
-<description>Use this wizard to export an EJB module into a JAR file. Select the EJB module to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file. </description>
-<!--topic label="Exporting an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teexp.html"/-->
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-</context>
-
-<context id="EXPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to export a connector project into a RAR file. Select the connector project to export, and provide a directory and filename for the exported RAR file.
-
-Select <b>Export source files</b> to include source files in the RAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file.
-</description>
-<!--topic label="Exporting a connector project to a RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjexprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/topics/tjrar.html"/-->
-</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
deleted file mode 100644
index db53b3b..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to import an application client JAR file. Locate the application client JAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target server</b> field to specify the application server that the imported project will be developed for.
-
-You can also specify whether or not to add the imported application client module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-
-<context id="EAR_IMPORT_EAR_WIZARD_PAGE1">
- <!-- wizard broken at time of this writing -->
-<description>Use this wizard to import an enterprise application EAR file. Locate the enterprise application EAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target server</b> field to specify the application server that the resulting projects will be developed for.
-</description>
-<!--topic label="Importing an enterprise application EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-
-
-<context id="EJB_IMPORT_EJB_WIZARD_PAGE1">
-<description>Use this wizard to import an EJB JAR file. Locate the EJB JAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target server</b> field to specify the application server that the imported project will be developed for.
-
-You can also specify whether or not to add the imported EJB module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-<!--topic label="Creating an EJB project" href="../com.ibm.etools.ejb.assembly.doc/topics/tecrtpro.html"/-->
-</context>
-
-<context id="IMPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to import a JCA Connector RAR file. Locate the Connector RAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target server</b> field to specify the application server that the imported project will be developed for.
-
-You can also specify whether or not to add the imported connector module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing a connector project RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjimprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/hmtl/tjrar.html"/-->
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
deleted file mode 100644
index 14bd532..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="com.ibm.wtp.ui.ProjectNavigator">
-<description>The J2EE Project Explorer view provides a hierarchical view of the content models for resources in the workbench. From this view, you can open the various project files in the appropriate editor.
-
-By right-clicking on modules, you can access the pop-up context menu for additional development options.
-</description>
-<!--topic label="J2EE Hierarchy and Project Navigator views" href="../com.ibm.etools.j2eeapp.doc/topics/cjview.html"/-->
-<!--topic label="J2EE perspective" href="../com.ibm.etools.j2eeapp.doc/topics/cjpers.html"/-->
-</context>
-
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 9df464a..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.infopop; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
deleted file mode 100644
index e7b6e42..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<!--Eclipse preferences -->
-
-<context id="FlexibleProject">
- <!-- Flexible Java Project preferences-->
-<description>Select <b>Allow Multiple modules per project</b> to allow an enterprise application (EAR) project to contain more than one module
-of a particular type. For instance, more than one Application Client module.
-</description>
-<!-- links to Flexible java project stuff-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE1">
- <!-- J2EE Annotations preferences main-->
-<description>Select the J2EE Annotation Provider to use.
-
-J2EE Annotations allow programmers to add specialized Javadoc tags to their source code, which can be used to generate code artifacts from templates.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE2">
- <!-- J2EE Annotations preferences XDoclet-->
-<description>Use this page to set the XDoclet runtime preferences. XDoclet must be installed on the local system to use this function.
-
-Select <b>Enable XDoclet Builder</b> to turn on annotation-based artifact creation.
-
-Select the <b>Version</b> of XDoclet. Supported versions include 1.2.1, 1.2.2, 1.2.3; XDoclet version 1.1.2 is no longer supported.
-
-Provide the installation directory (<b>XDoclet Home</b>) for XDoclet on the local system.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE3">
- <!-- J2EE Annotations preferences ejbdoclet-->
-<description>Ejbdoclet is a subset of the XDoclet specification that specifies details on EJB deployment descriptors.
-The syntax of deployment descriptors differs, depending on the vendor of the Application Server being used.
-
-Use this page to define which Application Server vendors to support. You can select one or more Application Server
-vendors, including JBoss, JOnAS, WebLogic, and WebSphere. Also select the version of the Application Server to support.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!--http://xdoclet.sourceforge.net/xdoclet/ant/xdoclet/modules/ejb/EjbDocletTask.html -->
-<!-- http://www.jboss.org-->
-<!-- http://jonas.objectweb.org/-->
-<!-- http:/www.bea.com-->
-<!-- http://www.ibm.com/software/websphere/-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
deleted file mode 100644
index 8bd3a03..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<!-- project preferences -->
-
-<context id="JARdep">
- <!-- JAR dependencies preferences-->
-<description>Use this page to specify dependent JAR files for modules within the associated project.
-
-Select <b>Use EJB JARs</b>, <b>Use EJB client JARs</b>, or <b>Allow both</b> to control which JAR files are listed. Then, select the JAR files from the list. This will update the run-time class path and Java project build path with the appropriate JAR files.
-
-The <b>Manifest Class-Path</b> field displays the manifest class-path changes based on the JAR files selected. This field is display only and shows you the class path for your module file.
-</description>
-<!-- need links to EJB base info, EJB Client info, project class paths-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="EARmod">
- <!-- EAR modules preferences-->
-<description><!-- page is blank at the time of this writing -->
-</description>
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/about.html b/docs/org.eclipse.jst.j2ee.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/build.properties b/docs/org.eclipse.jst.j2ee.infopop/build.properties
deleted file mode 100644
index 76f5c9f..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = DeleteBean_HelpContexts.xml,\
- EJBCreateWizard_HelpContexts.xml,\
- ExportWizard_HelpContexts.xml,\
- ImportWizard_HelpContexts.xml,\
- J2EEGeneral_HelpContexts.xml,\
- Preferences_HelpContexts.xml,\
- ProjectCreateWizard_HelpContexts.xml,\
- ProjectPrefs_HelpContexts.xml,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties b/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
deleted file mode 100644
index b56d2b5..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-pluginName = J2EE tools infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml b/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
deleted file mode 100644
index d1515ea..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<plugin>
-
- <extension point="org.eclipse.help.contexts">
- <contexts file="ExportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="ImportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="J2EEGeneral_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="EJBCreateWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="ProjectPrefs_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="Preferences_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- </extension>
-
-</plugin>
diff --git a/features/org.eclipse.jst.doc.user.feature/.cvsignore b/features/org.eclipse.jst.doc.user.feature/.cvsignore
deleted file mode 100644
index de0aa93..0000000
--- a/features/org.eclipse.jst.doc.user.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.doc.user.feature_0.7.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.doc.user.feature/.project b/features/org.eclipse.jst.doc.user.feature/.project
deleted file mode 100644
index 20b066a..0000000
--- a/features/org.eclipse.jst.doc.user.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.doc.isv.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.doc.user.feature/build.properties b/features/org.eclipse.jst.doc.user.feature/build.properties
deleted file mode 100644
index efba6ba..0000000
--- a/features/org.eclipse.jst.doc.user.feature/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = feature.properties,\
- feature.xml,\
- license.html,\
- epl-v10.html,\
- eclipse_update_120.jpg
-src.includes = build.properties,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html,\
- eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.doc.user.feature/epl-v10.html b/features/org.eclipse.jst.doc.user.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.doc.user.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.doc.user.feature/feature.properties b/features/org.eclipse.jst.doc.user.feature/feature.properties
deleted file mode 100644
index c14c9a7..0000000
--- a/features/org.eclipse.jst.doc.user.feature/feature.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-providerName=Eclipse.org
-
-description=J2EE Standard Tools Documentation
-
-license=\
-Eclipse Foundation Software User Agreement\n\
-January 28, 2005\n\
-\n\
-Usage Of Content\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories named "plugins" and Features are located in directories named "features".\n\
-\n\
-Features may also include other Features ("Included Features"). Files named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:\n\
-\n\
-The top-level (root) directory\n\
-Plug-in and Fragment directories\n\
-Subdirectories of the directory named "src" of certain Plug-ins\n\
-Feature directories \n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties". Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.\n\
-\n\
-Cryptography\n\
-Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n
diff --git a/features/org.eclipse.jst.doc.user.feature/feature.xml b/features/org.eclipse.jst.doc.user.feature/feature.xml
deleted file mode 100644
index 1bbce31..0000000
--- a/features/org.eclipse.jst.doc.user.feature/feature.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.doc.user.feature"
- label="J2EE Standard Tools Doc Feature"
- version="1.0.2.qualifier"
- provider-name="%providerName">
- <install-handler/>
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <requires>
- <import plugin="org.eclipse.help"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.ejb.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.server.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.server.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.doc.user.feature/license.html b/features/org.eclipse.jst.doc.user.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.doc.user.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore b/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.project b/features/org.eclipse.jst.enterprise_core.feature/.project
deleted file mode 100644
index b522b47..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/build.properties
deleted file mode 100644
index 4db7b03..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.xml b/features/org.eclipse.jst.enterprise_core.feature/feature.xml
deleted file mode 100644
index 7350dd3..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_core.feature"
- label="JST Enterprise Core Feature"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.platform" version="3.1.1" match="equivalent"/>
- <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
- <import feature="org.eclipse.jem" version="1.1.0.1" match="equivalent"/>
- <import feature="org.eclipse.jst.web_core.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.jst.common_core.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.jst.server_core.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.wst.ws_core.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.uddi4j.feature" version="2.0.3" match="greaterOrEqual"/>
- <import feature="org.eclipse.emf.ecore.sdo" version="2.1.1" match="equivalent"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.j2ee.webservice"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.jca"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/license.html b/features/org.eclipse.jst.enterprise_core.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 7821841..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_core.feature.source"
- label="JST Enterprise Core Feature Source"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-
- <plugin
- id="org.eclipse.jst.enterprise_core.feature.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea0..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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 "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/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@
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index c3f1925..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-# 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index f95b457..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 85bf6e4..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore b/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
deleted file mode 100644
index 95a8d29..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-features
-plugins
-build.xml
-org.eclipse.jst.enterprise_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.project b/features/org.eclipse.jst.enterprise_sdk.feature/.project
deleted file mode 100644
index 44e6982..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties b/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
deleted file mode 100644
index 4a44299..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-
-generate.feature@org.eclipse.jst.enterprise_ui.feature.source=org.eclipse.jst.enterprise_ui.feature
-
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties b/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
deleted file mode 100644
index d3ee74f..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_sdk.feature"
- label="JST Enterprise Feature SDK"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.jst.enterprise_ui.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/license.html b/features/org.eclipse.jst.enterprise_sdk.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore b/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.project b/features/org.eclipse.jst.enterprise_ui.feature/.project
deleted file mode 100644
index 9569563..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_ui.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/build.properties
deleted file mode 100644
index 4db7b03..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
deleted file mode 100644
index 91b6757..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_ui.feature"
- label="JST Enterprise UI Feature"
- version="1.0.3.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.jst.enterprise_userdoc.feature"
- version="0.0.0"/>
-
- <requires>
- <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
- <import feature="org.eclipse.jem" version="1.1.0.1" match="equivalent"/>
- <import feature="org.eclipse.platform" version="3.1.1" match="equivalent"/>
- <import feature="org.eclipse.jdt" version="3.1.1" match="equivalent"/>
- <import feature="org.eclipse.wst.rdb_core.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.apache.axis.feature" version="1.2.1" match="greaterOrEqual"/>
- <import feature="org.uddi4j.feature" version="2.0.3" match="greaterOrEqual"/>
- <import feature="org.wsdl4j.feature" version="1.4.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_ui.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.wst.rdb_ui.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.wst.server_ui.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.wst.web_ui.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.wst.ws_ui.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.jst.enterprise_core.feature" version="1.0.2" match="equivalent"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.ws"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.creation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.consumption.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.jca.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.navigator.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.webservice.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.consumption.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.servlet.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.uddiregistry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.creation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.servlet.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.creation.ejb.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ejb.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotation.model"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.emitter"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.xdoclet.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 2ff9234..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.enterprise_core.feature.source = org.eclipse.jst.enterprise_core.feature
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 01950e3..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,132 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse JDT Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-description=API documentation and source code zips for Eclipse Java development tools.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 3a3edfb..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_ui.feature.source"
- label="JST Enterprise SDK Source"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.jst.enterprise_core.feature.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.enterprise_ui.feature.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea0..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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 "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/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@
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e00fafa..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-# 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index d6209ea..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore b/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
deleted file mode 100644
index 4b5f609..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.enterprise_userdoc.feature_1.0.0.jar
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.project b/features/org.eclipse.jst.enterprise_userdoc.feature/.project
deleted file mode 100644
index ffcfb55..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_userdoc.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
deleted file mode 100644
index 4db7b03..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
deleted file mode 100644
index 4988d7f..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_userdoc.feature"
- label="JST Enterprise Feature User Documentation"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-
- <plugin
- id="org.eclipse.jst.ejb.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html b/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_core.feature/.cvsignore b/features/org.eclipse.jst.web_core.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.web_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_core.feature/.project b/features/org.eclipse.jst.web_core.feature/.project
deleted file mode 100644
index 5eac7ba..0000000
--- a/features/org.eclipse.jst.web_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_core.feature/build.properties b/features/org.eclipse.jst.web_core.feature/build.properties
deleted file mode 100644
index 4db7b03..0000000
--- a/features/org.eclipse.jst.web_core.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature/feature.properties b/features/org.eclipse.jst.web_core.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.web_core.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/feature.xml b/features/org.eclipse.jst.web_core.feature/feature.xml
deleted file mode 100644
index 9d397c4..0000000
--- a/features/org.eclipse.jst.web_core.feature/feature.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_core.feature"
- label="JST Web Core Feature"
- version="1.0.3.qualifier"
- provider-name="Eclilpse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <requires>
- <import feature="org.eclipse.platform" version="3.1.2" match="equivalent"/>
- <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
- <import feature="org.eclipse.jdt" version="3.1.2" match="equivalent"/>
- <import feature="org.eclipse.jem" version="1.1.0.1" match="equivalent"/>
- <import feature="org.eclipse.jst.common_core.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.jst.server_core.feature" version="1.0.2" match="equivalent"/>
- <import feature="org.eclipse.wst.web_core.feature" version="1.0.2" match="equivalent"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.common.annotations.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.annotations.controller"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.frameworks"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.navigator.java"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature/license.html b/features/org.eclipse.jst.web_core.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.web_core.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 8e67b0f..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_core.feature.source"
- label="JST Web Core Feature Source"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-
- <plugin
- id="org.eclipse.jst.web_core.feature.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea0..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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 "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/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@
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index cedcbea..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-# 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index f95b457..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index f188816..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pluginName=J2EE Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_sdk.feature/.cvsignore b/features/org.eclipse.jst.web_sdk.feature/.cvsignore
deleted file mode 100644
index 262183f..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.jst.web_sdk.feature_1.0.0.bin.dist.zip
-features
-plugins
-dev.properties
diff --git a/features/org.eclipse.jst.web_sdk.feature/.project b/features/org.eclipse.jst.web_sdk.feature/.project
deleted file mode 100644
index 0aa6f52..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_sdk.feature/build.properties b/features/org.eclipse.jst.web_sdk.feature/build.properties
deleted file mode 100644
index 4e40c84..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-
-
-generate.feature@org.eclipse.jst.web_ui.feature.source=org.eclipse.jst.web_ui.feature
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html b/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.properties b/features/org.eclipse.jst.web_sdk.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.xml b/features/org.eclipse.jst.web_sdk.feature/feature.xml
deleted file mode 100644
index 918ec1d..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_sdk.feature"
- label="JST Web Feature SDK"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.jst.web_ui.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_sdk.feature/license.html b/features/org.eclipse.jst.web_sdk.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_ui.feature/.cvsignore b/features/org.eclipse.jst.web_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.web_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_ui.feature/.project b/features/org.eclipse.jst.web_ui.feature/.project
deleted file mode 100644
index 75b7697..0000000
--- a/features/org.eclipse.jst.web_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_ui.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_ui.feature/build.properties b/features/org.eclipse.jst.web_ui.feature/build.properties
deleted file mode 100644
index 4db7b03..0000000
--- a/features/org.eclipse.jst.web_ui.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.properties b/features/org.eclipse.jst.web_ui.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.xml b/features/org.eclipse.jst.web_ui.feature/feature.xml
deleted file mode 100644
index d8dd0d8..0000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_ui.feature"
- label="JST Web UI Feature"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.jst.web_userdoc.feature"
- version="0.0.0"/>
-
- <requires>
- <import feature="org.eclipse.jst.web_core.feature" version="1.0.2" match="equivalent"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.common.annotations.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature/license.html b/features/org.eclipse.jst.web_ui.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.web_ui.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index a7c973f..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.web_core.feature.source = org.eclipse.jst.web_core.feature
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 01950e3..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,132 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse JDT Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-description=API documentation and source code zips for Eclipse Java development tools.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 3351b82..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_ui.feature.source"
- label="JST Web UI Feature Source"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.jst.web_core.feature.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.web_ui.feature.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea0..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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 "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/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@
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 307bab9..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-# 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index e711acf..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pluginName=J2EE Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore b/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.project b/features/org.eclipse.jst.web_userdoc.feature/.project
deleted file mode 100644
index 5650104..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_userdoc.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/build.properties b/features/org.eclipse.jst.web_userdoc.feature/build.properties
deleted file mode 100644
index 4db7b03..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-src.includes = build.properties
diff --git a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.properties b/features/org.eclipse.jst.web_userdoc.feature/feature.properties
deleted file mode 100644
index 64893f7..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,130 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.xml b/features/org.eclipse.jst.web_userdoc.feature/feature.xml
deleted file mode 100644
index 519e51e..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_userdoc.feature"
- label="User Documentation for JST Web Feature"
- version="1.0.2.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/license.html b/features/org.eclipse.jst.web_userdoc.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.classpath b/plugins/org.eclipse.jst.common.annotations.controller/.classpath
deleted file mode 100644
index 4098681..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="controller"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore b/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
deleted file mode 100644
index ee6c033..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-controller.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.project b/plugins/org.eclipse.jst.common.annotations.controller/.project
deleted file mode 100644
index 8cc7f22..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.annotations.controller</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
deleted file mode 100644
index 0b03474..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation Controller Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.controller; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.common.internal.annotations.controller,
- org.eclipse.jst.common.internal.annotations.registry
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.wst.common.emf,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.jst.common.annotations.core
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/about.html b/plugins/org.eclipse.jst.common.annotations.controller/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/build.properties b/plugins/org.eclipse.jst.common.annotations.controller/build.properties
deleted file mode 100644
index 02688ea..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/build.properties
+++ /dev/null
@@ -1,22 +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
-###############################################################################
-bin.includes = .template,\
- plugin.xml,\
- schema/,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- .
-jars.compile.order = .
-src.includes = schema/
-output.. = bin/
-source.. = controller/,\
- property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
deleted file mode 100644
index 31a30cd..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
+++ /dev/null
@@ -1,86 +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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-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.IStatus;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Annotations Controller interface used for communicating with emitters and determining available
- * tag sets
- */
-public interface AnnotationsController {
-
- /**
- * Determines if a tag handler is installed for the specified tag
- *
- * @param tagset
- * the name of a tagset (e.g. "ejb")
- * @return true only if the given tagset is available and enabled
- */
- public boolean isTagHandlerInstalled(String tagset);
-
- /**
- * Disables annotation processing for the specified resource
- *
- * @param modelObject
- * The Annotated EMF Object
- * @param tagset
- * The name of the annotations tagset to disable on the object
- * @return an IStatus representing success or failure
- */
- public IStatus disableAnnotations(EObject modelObject, String tagset);
-
- /**
- * Returns the associated annotated file if the specified model object was generated via
- * annotations from a parent resource and is enabled
- *
- * @param modelObject
- * The Annotated EMF Object
- * @return the annotated source file associated with the given modelObject
- */
- public IFile getEnabledAnnotationFile(EObject modelObject);
-
- /**
- * Process the annotations on the given resource during creation
- *
- * @return all files touched by the annotations processing
- * @throws CoreException
- * if a problem occurs while processing
- */
- public IFile[] process(IResource res) throws CoreException;
-
- /**
- * Process the annotations on the given resource array
- *
- * @return all files touched by the annotations processing
- * @throws CoreException
- * if a problem occurs while processing
- */
- public IFile[] process(IResource[] res) throws CoreException;
-
- /**
- * Provides the annotation processor an opportunity to initialize
- */
- public void initialize(IProject project);
-
- /**
- * Provides the annotation processor an opportunity to dispose and cleanup
- */
- public void dispose();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
deleted file mode 100644
index b5d5147..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
+++ /dev/null
@@ -1,218 +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.jst.common.internal.annotations.controller;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsAdapter;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsProviderManager;
-import org.eclipse.jst.common.internal.annotations.core.IAnnotationsProvider;
-
-/**
- * @author mdelder
- *
- */
-public class AnnotationsControllerHelper {
- public static final AnnotationsControllerHelper INSTANCE = new AnnotationsControllerHelper();
-
- protected AnnotationsControllerHelper() {
- super();
- }
-
- /**
- *
- * @param eObject the annotated? model object
- * @return true only if the object has annotations
- */
- public boolean isAnnotated(EObject eObject) {
- if (AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED) != null)
- return true;
- List annotationsProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
- for (int i=0; i<annotationsProviders.size(); i++) {
- IAnnotationsProvider provider = (IAnnotationsProvider) annotationsProviders.get(i);
- if (provider!=null && provider.isAnnotated(eObject))
- return true;
- }
- return false;
- }
-
- /**
- * A convenience method to tag a model object as annotated
- *
- * @param eObject
- * @param value
- */
- public void setAnnotated(EObject eObject, String value) {
- AnnotationsAdapter.addAnnotations(eObject, AnnotationsAdapter.GENERATED, value);
- }
-
- /**
- * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
- * information.
- *
- * @param eObject
- * @param name
- * A string key
- * @param value
- * A String value
- */
- public void addAnnotations(EObject eObject, String name, Object value) {
- AnnotationsAdapter.addAnnotations(eObject, name, value);
- }
-
- /**
- * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
- * information.
- *
- * @param eObject
- * @param name
- * A string key
- * @param value
- * A String value
- */
- public Object getAnnotations(EObject eObject, String name) {
- return AnnotationsAdapter.getAnnotations(eObject, name);
- }
-
- /**
- * Acquires the generated annotation comment and parses the Fragment URL of the following form
- * to return the tagset name:
- *
- * com.acme.ejbs.MyEJB# <tagset>/ <fragment>. <fragment-pointer>
- *
- * @param eObject
- * The annotated object
- * @return the value of <tagset>in the URL example
- */
- public String getTagset(EObject eObject) {
- String tagset = getTagsetFromProviders(eObject);
- if (tagset == null) {
- tagset = getTagsetFromFragment(eObject);
- }
- return tagset;
- }
-
- /**
- * Acquires the generated annotation comment and parses the Fragment URL of the following form
- * to return the tagset name:
- *
- * com.acme.ejbs.MyEJB# <tagset>/ <fragment>. <fragment-pointer>
- *
- * @param eObject
- * The annotated object
- * @return the value of <tagset>in the URL example
- */
- private String getTagsetFromFragment(EObject eObject) {
-
- String generatedComment = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
- if (generatedComment == null || generatedComment.length() == 0)
- return null;
- int poundit = generatedComment.indexOf('#');
- int slash = generatedComment.indexOf('/');
- if (poundit < 0 || slash < 0 || poundit >= slash)
- return null;
- return generatedComment.substring(poundit + 1, slash);
-
- }
-
- /**
- * Detect the primary tagset used to create an eObject using the providers.
- *
- * @since 1.0.2
- * @param eObject - An {@link EObject} that may be annotated.
- * @return a String array of the used tagset names.
- */
- private String getTagsetFromProviders(EObject eObject) {
- String tagset = null;
- List annotationProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
- int size = annotationProviders.size();
- for (int i=0; i < size && tagset == null; i++) {
- IAnnotationsProvider provider = (IAnnotationsProvider) annotationProviders.get(i);
- tagset = provider != null ? provider.getPrimaryTagset(eObject) : null;
- }
- return tagset;
- }
-
- /**
- * Returns the CompilationUnit associated with the given model object
- *
- * @param eObject
- * an Annotated model Object
- * @return The compilation unit which was responsible for the generation of the model object
- */
- public ICompilationUnit getAnnotatedCU(EObject eObject) {
- String fragementString = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
- if (fragementString == null)
- return null;
-
- String typeString = fragementString.substring(0, fragementString.indexOf('#'));
- IType itype;
-
- if (typeString != null && (itype = findType(typeString, eObject)) != null) {
- return itype.getCompilationUnit();
- }
- return null;
- }
-
- /**
- * Need to delegate the retrieval of the annotated {@link ICompilationUnit} for
- * the passed eObject. There could be multiple but in this case the first will be returned.
- *
- * <p>
- * This API would need to be revisited in the future if there is a requirement to show
- * all {@link ICompilationUnit} elements that contribute to the eObject via annotations.
- * </p>
- *
- * @param eObject - an instance of an {@link EObject} that may be annotated.
- * @since 1.0.2
- */
- private ICompilationUnit getAnnotatedCUFromProvider(EObject eObject) {
- ICompilationUnit primaryCU = null;
- List annotationProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
- int size = annotationProviders.size();
- for (int i=0; i < size && primaryCU == null; i++) {
- IAnnotationsProvider provider = (IAnnotationsProvider) annotationProviders.get(i);
- primaryCU = provider != null ? provider.getPrimaryAnnotatedCompilationUnit(eObject) : null;
- }
- return primaryCU;
- }
-
- protected IType findType(String type, EObject eObject) {
- IType result = null;
- IProject project = ProjectUtilities.getProject(eObject);
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- if (javaProject != null)
- try {
- result = javaProject.findType(type);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- return result;
- }
-
- /**
- * Return true if <code>project</code> has annotation support enabled on it.
- *
- * @return
- */
- public boolean hasAnnotationSupport(IProject project) {
- return AnnotationsControllerManager.INSTANCE.hasAnnotationsBuilder(project);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
deleted file mode 100644
index ed63da7..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
+++ /dev/null
@@ -1,220 +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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationsControllerResources;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener;
-import org.eclipse.wst.common.frameworks.internal.enablement.Identifiable;
-import org.eclipse.wst.common.frameworks.internal.enablement.IdentifiableComparator;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-
-
-/**
- * AnnotationsControllerRegistry for reading annotations controller extensions
- */
-public class AnnotationsControllerManager extends RegistryReader implements IEnablementIdentifierListener {
-
- public static final AnnotationsControllerManager INSTANCE = new AnnotationsControllerManager();
-
- static {
- INSTANCE.readRegistry();
- }
-
- private SortedSet descriptors;
-
- private Map annotationsControllers;
-
- public static class Descriptor implements Identifiable {
-
- public static final String ANNOTATIONS_CONTROLLER = "annotationsController"; //$NON-NLS-1$
-
- public static final String ATT_ID = "id"; //$NON-NLS-1$
-
- public static final String CLASS = "class"; //$NON-NLS-1$
-
- public static final String BUILDER_ID = "builderID"; //$NON-NLS-1$
-
- private final IConfigurationElement configElement;
- private final String ID;
- private String builderID;
- private final int loadOrder;
- private static int loadOrderCounter = 0;
-
- public Descriptor(IConfigurationElement aConfigElement) {
- super();
- Assert.isLegal(ANNOTATIONS_CONTROLLER.equals(aConfigElement.getName()), AnnotationsControllerResources.AnnotationsControllerManager_ERROR_0); //$NON-NLS-1$
- configElement = aConfigElement;
- ID = configElement.getAttribute(ATT_ID);
- builderID = configElement.getAttribute(BUILDER_ID);
- loadOrder = loadOrderCounter++;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getID()
- */
- public String getID() {
- return ID;
- }
-
- public String getBuilderID() {
- return builderID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getLoadOrder()
- */
- public int getLoadOrder() {
- return loadOrder;
- }
-
- public AnnotationsController createInstance() {
- AnnotationsController instance = null;
- try {
- instance = (AnnotationsController) configElement.createExecutableExtension(CLASS);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return instance;
- }
- }
-
- /**
- * Default constructor
- */
- public AnnotationsControllerManager() {
- super("org.eclipse.jst.common.annotations.controller", "annotationsController"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * read extension element
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(Descriptor.ANNOTATIONS_CONTROLLER))
- return false;
- addAnnotationController(new Descriptor(element));
- return true;
- }
-
- /**
- * @param descriptor
- */
- protected void addAnnotationController(Descriptor descriptor) {
- EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), null).addIdentifierListener(this);
- getDescriptors().add(descriptor);
- }
-
- /**
- * @return Returns the annotationControllers.
- */
- protected SortedSet getDescriptors() {
- if (descriptors == null)
- descriptors = new TreeSet(IdentifiableComparator.getInstance());
- return descriptors;
- }
-
- public Descriptor getDescriptor(IProject project) {
- for (Iterator iter = getDescriptors().iterator(); iter.hasNext();) {
- Descriptor descriptor = (Descriptor) iter.next();
- IEnablementIdentifier identifier = EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), project);
- if (identifier.isEnabled())
- return descriptor;
- }
- return null;
- }
-
- /**
- * Determine if any annotations are supported
- */
- public boolean isAnyAnnotationsSupported() {
- return getDescriptors().size() > 0;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener#identifierChanged(org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent)
- */
- public void identifierChanged(EnablementIdentifierEvent identifierEvent) {
- IProject project = ((EnablementIdentifier) identifierEvent.getIdentifier()).getProject();
- getAnnotationsControllers().remove(project);
- }
-
- /**
- * Return the annotations controller for the specified project
- */
- public AnnotationsController getAnnotationsController(IProject project) {
- AnnotationsController controller = (AnnotationsController) getAnnotationsControllers().get(project);
- if (controller == null) {
- if (!hasAnnotationsBuilder(project))
- return null;
- Descriptor descriptor = getDescriptor(project);
- if (descriptor != null)
- getAnnotationsControllers().put(project, (controller = descriptor.createInstance()));
- }
-
- return controller;
- }
-
- /**
- * @return Returns the annotationControllers.
- */
- public Map getAnnotationsControllers() {
- if (annotationsControllers == null)
- annotationsControllers = new WeakHashMap();
- return annotationsControllers;
- }
-
- public boolean hasAnnotationsBuilder(IProject project) {
- Descriptor annotationsDescriptor = getDescriptor(project);
- if (annotationsDescriptor==null)
- return false;
- return hasBuilder(project, annotationsDescriptor.getBuilderID());
- }
-
- public boolean hasBuilder(IProject project, String builderName) {
- try {
- ICommand[] builders = project.getDescription().getBuildSpec();
- for (int i = 0; i < builders.length; i++) {
- ICommand builder = builders[i];
- if (builder != null) {
- if (builder.getBuilderName().equals(builderName))
- return true;
- }
- }
- } catch (Exception e) {
- // Do nothing
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java
deleted file mode 100644
index 122209c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java
+++ /dev/null
@@ -1,23 +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.jst.common.internal.annotations.registry;
-
-/**
- * This method will be called by the AnnotationTagRegistry
- * when it is time to register the tags for a given
- * TagSet. An AnnotationTagDynamicInitializer defined
- * using the annotationTagDynamicInitializer.
- *
- * @see com.ibm.wtp.annotations.registry.AnnotationTagRegistry
- */
-public interface AnnotationTagDynamicInitializer {
- void registerTags();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
deleted file mode 100644
index 89d232b..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
+++ /dev/null
@@ -1,512 +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
- *******************************************************************************/
-/*
- * Created on Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * @author kelleyp
- *
- * Singleton that parses the annotation tag information from the annotation-taghandler extension
- * point, and provides an interface for accessing it for other classes. Largely taken from the
- * AnnotationProcessor builder.
- */
-
-public class AnnotationTagRegistry {
-
- /**
- * Set to true once we've read in the annotation tag information from the plugin registry.
- */
- private static boolean initialized = false;
- private static final String ANNOTATION_TAG_INFO = "org.eclipse.jst.common.annotations.controller.AnnotationTagInfo"; //$NON-NLS-1$
-
- /**
- * List of tag specs for all of the tags.
- */
- private static ArrayList allTagSpecs = new ArrayList() {
- final private static long serialVersionUID = 8683452581122892190L;
-
- private void scopeAll(Collection c, boolean forAdd) {
- Iterator iter = c.iterator();
- while (iter.hasNext()) {
- TagSpec ts = (TagSpec) iter.next();
- if (forAdd)
- addScope(ts);
- else
- removeScope(ts);
- }
- }
-
- private void addScope(TagSpec ts) {
- if (ts == null)
- return;
- switch (ts.getScope()) {
- case TagSpec.FIELD :
- fieldTags.put(ts.getTagName(), ts);
- break;
- case TagSpec.METHOD :
- methodTags.put(ts.getTagName(), ts);
- break;
- case TagSpec.TYPE :
- typeTags.put(ts.getTagName(), ts);
- break;
- }
- }
-
- private void removeScope(TagSpec ts) {
- if (ts == null)
- return;
- switch (ts.getScope()) {
- case TagSpec.FIELD :
- fieldTags.remove(ts.getTagName());
- break;
- case TagSpec.METHOD :
- methodTags.remove(ts.getTagName());
- break;
- case TagSpec.TYPE :
- typeTags.remove(ts.getTagName());
- break;
- }
- }
-
- public void add(int index, Object element) {
- super.add(index, element);
- addScope((TagSpec)element);
- }
-
- public boolean add(Object o) {
- TagSpec newTagSpec = (TagSpec)o;
- // search for already existing tag spec with same name and same tag set name
- for (int i=0; i<this.size(); i++) {
- TagSpec tagSpec = (TagSpec) get(i);
- if (tagSpec.getTagName().equals(newTagSpec.getTagName()) && tagSpec.getScope() == newTagSpec.getScope()) {
- remove(tagSpec);
- removeScope(tagSpec);
- }
- }
- // add the new tag spec
- addScope(newTagSpec);
- return super.add(newTagSpec);
- }
-
- public boolean addAll(Collection c) {
- scopeAll(c, true);
- return super.addAll(c);
- }
-
- public boolean addAll(int index, Collection c) {
- scopeAll(c, true);
- return super.addAll(index, c);
- }
-
- public Object remove(int index) {
- Object result = super.remove(index);
- removeScope((TagSpec) result);
- return result;
- }
-
- public boolean remove(Object o) {
- removeScope((TagSpec) o);
- return super.remove(o);
- }
-
- public boolean removeAll(Collection c) {
- scopeAll(c, false);
- return super.removeAll(c);
- }
-
- public boolean retainAll(Collection c) {
- Iterator iter = this.iterator();
- while (iter.hasNext()) {
- TagSpec ts = (TagSpec) iter.next();
- if (!c.contains(ts))
- removeScope(ts);
- }
- return super.retainAll(c);
- }
- };
-
- /**
- * Map from a tag name to a InitTagInfo. Only live during up to the end of the init() method.
- */
- private static Hashtable tagAttribs = new Hashtable();
-
- /**
- * Division of tag names between allowed scopes.
- */
- private static Map methodTags = new HashMap();
-
- private static Map typeTags = new HashMap();
-
- private static Map fieldTags = new HashMap();
-
- private static final String CLASS_PROP = "class"; //$NON-NLS-1$
- private static final String DYNAMIC_INITIALIZER_EX_PT = "annotationTagDynamicInitializer"; //$NON-NLS-1$
- private static final String ANNOTATIONS_CONTROLLER_NAMESPACE = "org.eclipse.jst.common.annotations.controller"; //$NON-NLS-1$
-
- /**
- * Helper for init, parse the tag attributes for a AnnotationTagInfo tag.
- *
- * @param elems
- * Array of "attrib" configuration elements.
- * @param tagName
- * Lowercased name of the tag these attributes are associated with.
- */
- private static InitTagInfo parseTagAttribs(IConfigurationElement[] elems, String tagName, String scope) {
- int i;
- ArrayList attribList = new ArrayList();
-
- InitTagInfo tagInf = new InitTagInfo(tagName, scope, attribList);
-
- for (i = 0; i < elems.length; i++) {
- IConfigurationElement elem = elems[i];
-
- if (elem.getName().equalsIgnoreCase("attrib")) { //$NON-NLS-1$
- TagAttribSpec tas = new TagAttribSpec(elem.getAttribute("name"), elem.getAttribute("description")); //$NON-NLS-1$ //$NON-NLS-2$
- String use = elem.getAttribute("use"); //$NON-NLS-1$
-
- tas.setType(elem.getAttribute("type")); //$NON-NLS-1$
-
- // add valid values
- if ("enum".equals(elem.getAttribute("type"))) { //$NON-NLS-1$ //$NON-NLS-2$
- IConfigurationElement[] validValues = elem.getChildren("enumValues"); //$NON-NLS-1$
- List valuesList = new ArrayList();
- for (int j = 0; j < validValues.length; j++) {
- String value = validValues[j].getAttribute("value"); //$NON-NLS-1$
- valuesList.add(value);
- }
- String[] validValuesArray = new String[valuesList.size()];
- validValuesArray = (String[]) valuesList.toArray(validValuesArray);
-
- tas.setValidValues(validValuesArray);
- }
-
- if (use == null) {
- tas.clearRequired();
- } else if (use.equalsIgnoreCase("required")) { //$NON-NLS-1$
- tas.setRequired();
- } else if (use.equalsIgnoreCase("optional")) { //$NON-NLS-1$
- tas.clearRequired();
- } else {
- // Unlikely, unless annotation extension spec changes
- // without changes here.
- System.err.println(AnnotationsControllerResources.AnnotationTagRegistry_9 + use); //$NON-NLS-1$
- return null;
- }
-
- IConfigurationElement[] elemUniqueArray = elem.getChildren("unique"); //$NON-NLS-1$
- if (elemUniqueArray.length > 0) {
- tas.setUnique();
- if (elemUniqueArray[0].getAttribute("scope") != null) //$NON-NLS-1$
- tas.getUnique().setScope(TagAttribSpec.uniqueScopeFromString(elemUniqueArray[0].getAttribute("scope"))); //$NON-NLS-1$
- if (elemUniqueArray.length > 1) {
- Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_2 + elemUniqueArray.length); //$NON-NLS-1$
- }
- } else {
- tas.clearUnique();
- }
-
- attribList.add(tas);
- }
- }
- return tagInf;
- }
-
- /**
- * Return the tag set name from a full tag name.
- *
- * @param name
- * Full tag name (without the '@' at the beginning)
- * @return
- */
- public static String tagSetFromTagName(String name) {
- if (name == null)
- return null;
- int idx = name.lastIndexOf('.');
-
- if (idx != -1)
- return name.substring(0, idx);
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Return the short name from a full tag name.
- *
- * @param name
- * Full tag name (without the '@' at the beginning)
- * @return
- */
- public static String tagFromTagName(String name) {
- if (name == null)
- return null;
- int idx = name.indexOf('.');
-
- if (idx != -1) {
- return name.substring(idx + 1);
- }
- // Default to the whole name being the tagset.
- return name;
- }
-
- /**
- * Reads in all of the tag attribute information from all annotation-tag-info extensions defined
- * in the system, and initializes the tagAttribs hashtable with them.
- *
- * @param registry
- */
- private static void readAllAttributeInfo(IExtensionPoint xp) {
-
- if (xp == null) {
- return;
- }
-
- IExtension[] exts = xp.getExtensions();
- Bundle bundle = null;
- for (int i = 0; i < exts.length; i++) {
- IConfigurationElement[] elems = exts[i].getConfigurationElements();
- bundle = Platform.getBundle(exts[i].getNamespace());
- String identifier = exts[i].getUniqueIdentifier();
-
- IConfigurationElement elem = null;
- String tagName = null;
- String scope = null;
- String tagSet = null;
- String fullTagName = null;
- for (int j = 0; j < elems.length; j++) {
- elem = elems[j];
- if (!elem.getName().equalsIgnoreCase("AnnotationTagInfo")) { //$NON-NLS-1$
- continue;
- }
- tagSet = elem.getAttribute("tagSet"); //$NON-NLS-1$
- tagName = elem.getAttribute("tagName"); //$NON-NLS-1$
- scope = elem.getAttribute("scope"); //$NON-NLS-1$
- if (isNullOrEmpty(tagSet) || isNullOrEmpty(tagName) || isNullOrEmpty(scope)) {
- Logger.getLogger().log(NLS.bind(AnnotationsControllerResources.AnnotationTagRegistry_10, new Object[]{identifier})); //$NON-NLS-1$ //$NON-NLS-2$
- continue;
- }
- fullTagName = tagSet + "." + tagName; //$NON-NLS-1$
-
- InitTagInfo tagInf = parseTagAttribs(elem.getChildren(), fullTagName.toLowerCase(), scope); //$NON-NLS-1$
- String key = (fullTagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
- /*
- * There should only ever be one AnnotationTagInfo tag for any one annotation tag.
- */
- if (tagAttribs.containsKey(key)) {
- Logger.getLogger().log(AnnotationsControllerResources.AnnotationTagRegistry_0 + tagName + "'."); //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- tagInf.bundle = bundle;
- tagAttribs.put(key, tagInf);
- }
- }
- }
- }
-
- private static boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- /**
- * Reads tagSpec information in from the plugin registry. Taken from AnnotationProcessor.
- *
- * @return True if initialization completed successfully.
- * @throws CoreException
- * If there were problems reading the registry.
- */
- private static/* synchronized */boolean init() throws CoreException {
-
- /* Prevent multiple initialization */
- if (initialized) {
- return true;
- }
- initializeStaticTagDefinitions();
- initiaizeDynamicTagDefinitions();
- initialized = true;
-
- /* Don't need this anymore */
- tagAttribs = null;
-
- return true;
- }
-
- private static void initializeStaticTagDefinitions() throws CoreException {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
-
- // TODO: Not even checking the tagset extension point yet.
- IExtensionPoint xp = registry.getExtensionPoint(ANNOTATION_TAG_INFO);
-
- if (xp == null)
- return;
-
- IExtension[] x = xp.getExtensions();
-
- /* Get all tag attribute information */
- readAllAttributeInfo(xp);
- for (int j = 0; j < x.length; j++) {
- IConfigurationElement[] tagSpecs = x[j].getConfigurationElements();
- for (int i = 0; i < tagSpecs.length; i++) {
- IConfigurationElement tagSpec = tagSpecs[i];
- String tagName = tagSpec.getAttribute("tagSet") + "." + tagSpec.getAttribute("tagName"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String scope = tagSpec.getAttribute("scope"); //$NON-NLS-1$
- String multiplicity = tagSpec.getAttribute("multiplicity"); //$NON-NLS-1$
- TagSpec ts = null;
- if (multiplicity != null)
- ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.multiplicityFromString(multiplicity));
- else
- ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.Multiplicity.ONE);
- String key = (tagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
- InitTagInfo tagInf = (InitTagInfo) tagAttribs.get(key);
-
- allTagSpecs.add(ts);
-
- if (tagInf != null) {
- ts.setAttributes(tagInf.attributes);
- ts.setBundle(tagInf.bundle);
- }
- }
- }
- }
-
- private static void initiaizeDynamicTagDefinitions() {
- IExtensionPoint xp = Platform.getExtensionRegistry().getExtensionPoint(ANNOTATIONS_CONTROLLER_NAMESPACE, DYNAMIC_INITIALIZER_EX_PT);
- if (xp == null)
- return;
- IExtension[] extensions = xp.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- for (int j = 0; j < elements.length; j++) {
- try {
- AnnotationTagDynamicInitializer initializer = (AnnotationTagDynamicInitializer) elements[j].createExecutableExtension(CLASS_PROP);
- initializer.registerTags();
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
-
- /**
- *
- * @return List of AnnotationTagRegistry.TagSpecs for all tags.
- * @throws CoreException
- * If there were problems reading the initialization data from the plugin registry.
- */
- public static synchronized List getAllTagSpecs() {
- return allTagSpecs;
- }
-
- public static synchronized boolean isMethodTag(String tagName) {
- return methodTags.containsKey(tagName);
- }
-
- public static synchronized boolean isFieldTag(String tagName) {
- return fieldTags.containsKey(tagName);
- }
-
- public static synchronized boolean isTypeTag(String tagName) {
- return typeTags.containsKey(tagName);
- }
-
- /**
- * Answers the tagspec for the specified method tag name.
- *
- * @param tagName
- * Full name for a tag.
- * @return a TagSpec for the tag name, or null if no tag with that name is registered.
- */
- public static synchronized TagSpec getMethodTag(String tagName) {
- return (TagSpec) methodTags.get(tagName);
- }
-
- /**
- * Answers the tagspec for the specified field tag name.
- *
- * @param tagName
- * Full name for a tag.
- * @return a TagSpec for the tag name, or null if no tag with that name is registered.
- */
- public static synchronized TagSpec getFieldTag(String tagName) {
- return (TagSpec) fieldTags.get(tagName);
- }
-
- /**
- * Answers the tagspec for the specified type tag name.
- *
- * @param tagName
- * Full name for a tag.
- * @return a TagSpec for the tag name, or null if no tag with that name is registered.
- */
- public static synchronized TagSpec getTypeTag(String tagName) {
- return (TagSpec) typeTags.get(tagName);
- }
-
- private static class InitTagInfo {
- private String name;
-
- private List attributes;
-
- private Bundle bundle;
-
- private String scope;
-
- public InitTagInfo(String name, String scope, List att) {
- attributes = att;
- this.name = name;
- this.scope = scope;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- else if (!(obj instanceof InitTagInfo))
- return false;
-
- return name.equals(((InitTagInfo) obj).name) || (scope.equals(((InitTagInfo) obj).name));
-
- }
- }
-
- static {
- try {
- AnnotationTagRegistry.init();
- } catch (CoreException e) {
- Logger.getLogger().logError(AnnotationsControllerResources.AnnotationTagRegistry_ERROR_1); //$NON-NLS-1$
- Logger.getLogger().logError(e);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
deleted file mode 100644
index d86e117..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
+++ /dev/null
@@ -1,105 +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
- *******************************************************************************/
-/*
- * Created on Apr 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-
-/**
- * @author mdelder
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagsetRegistry extends RegistryReader {
-
- public static final AnnotationTagsetRegistry INSTANCE = new AnnotationTagsetRegistry();
-
- private Map index;
-
- protected AnnotationTagsetRegistry() {
- super("org.eclipse.wst.common.internal.annotations.controller", TagsetDescriptor.TAGSET); //$NON-NLS-1$
- readRegistry();
- }
-
- private List descriptors;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (TagsetDescriptor.TAGSET.equals(element.getName())) {
- getDescriptors().add(new TagsetDescriptor(element));
- return true;
- }
- return false;
- }
-
- public TagsetDescriptor getDescriptor(String name) {
- if (name != null && name.length() > 0) {
-
- /* Index descriptors to avoid unnecessary searching */
- TagsetDescriptor descriptor = (TagsetDescriptor) getIndex().get(name);
- if (descriptor != null)
- return descriptor;
-
- for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
- descriptor = (TagsetDescriptor) itr.next();
- if (name.equals(descriptor.getName())) {
- getIndex().put(descriptor.getName(), descriptor);
- return descriptor;
-
- }
- }
- }
- return null;
- }
-
- /**
- * @return Returns the descriptors.
- */
- protected List getDescriptors() {
- if (descriptors == null)
- descriptors = new ArrayList();
- return descriptors;
- }
-
- /**
- * @return Returns the index.
- */
- protected Map getIndex() {
- if (index == null)
- index = new HashMap();
- return index;
- }
-
- /**
- * @param descriptor
- */
- public void registerTagset(TagsetDescriptor descriptor) {
- if (descriptor != null && getDescriptor(descriptor.getName()) == null)
- getDescriptors().add(descriptor);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
deleted file mode 100644
index a143c59..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
+++ /dev/null
@@ -1,47 +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
- *******************************************************************************/
-/*
- * Created on Mar 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import org.eclipse.osgi.util.NLS;
-
-public class AnnotationsControllerResources extends NLS {
- private static final String BUNDLE_NAME = "annotationcontroller";//$NON-NLS-1$
-
- private AnnotationsControllerResources() {
- // Do not instantiate
- }
-
- public static String TagSpec_3;
- public static String TagSpec_4;
- public static String TagSpec_5;
- public static String TagSpec_6;
- public static String TagAttribSpec_1;
- public static String TagAttribSpec_2;
- public static String AnnotationTagParser_0;
- public static String AnnotationTagParser_1;
- public static String AnnotationTagRegistry_0;
- public static String AnnotationTagRegistry_9;
- public static String AnnotationTagRegistry_10;
- public static String AnnotationTagRegistry_11;
- public static String AnnotationsControllerManager_ERROR_0;
- public static String AnnotationTagRegistry_ERROR_1;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AnnotationsControllerResources.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
deleted file mode 100644
index be5670b..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
+++ /dev/null
@@ -1,79 +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.jst.common.internal.annotations.registry;
-
-/**
- * @author DABERG
- *
- */
-public class AttributeValueProposalHelper {
- private String replacementString;
- private int valueOffset = 0;
- private int replacementLength = 0;
- private String valueDisplayString;
- private boolean ensureBeginQuote = true;
- private boolean ensureEndQuote = true;
-
- public AttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
- this.replacementString = replacementString;
- this.valueOffset = valueOffset;
- this.replacementLength = replacementLength;
- this.valueDisplayString = valueDisplayString;
- }
-
- public int getReplacementLength() {
- return replacementLength;
- }
-
- public void setReplacementLength(int replacementLength) {
- this.replacementLength = replacementLength;
- }
-
- public String getReplacementString() {
- return replacementString;
- }
-
- public void setReplacementString(String replacementString) {
- this.replacementString = replacementString;
- }
-
- public String getValueDisplayString() {
- return valueDisplayString;
- }
-
- public void setValueDisplayString(String valueDisplayString) {
- this.valueDisplayString = valueDisplayString;
- }
-
- public int getValueOffset() {
- return valueOffset;
- }
-
- public void setValueOffset(int valueOffset) {
- this.valueOffset = valueOffset;
- }
-
- public boolean ensureBeginQuote() {
- return ensureBeginQuote;
- }
-
- public void setEnsureBeginQuote(boolean ensureBeginQuote) {
- this.ensureBeginQuote = ensureBeginQuote;
- }
-
- public boolean ensureEndQuote() {
- return ensureEndQuote;
- }
-
- public void setEnsureEndQuote(boolean ensureEndQuote) {
- this.ensureEndQuote = ensureEndQuote;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
deleted file mode 100644
index 76c0a8f..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
+++ /dev/null
@@ -1,48 +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
- *******************************************************************************/
-/*
- * Created on Jul 1, 2004
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * @author jlanuti
- */
-public interface AttributeValuesHelper {
- static final String[] EMPTY_VALUES = new String[0];
- static final AttributeValueProposalHelper[] EMPTY_PROPOSAL_HELPERS = new AttributeValueProposalHelper[0];
-
- /**
- * Return a simple String array containing the valid values for the given
- * {@link TagAttributeSpec}and {@link IJavaElement}.
- *
- * @param tas
- * @param javaElement
- * @return
- */
- public String[] getValidValues(TagAttribSpec tas, IJavaElement javaElement);
-
- /**
- * This is a more advanced api for returning valid values for a given {@link TagAttribSpec}.
- * This api provides you with more flexibility to control the replacement string that is used
- * for the completion.
- *
- * @param tas
- * @param partialValue
- * @param valueOffset
- * @param javaElement
- * @return
- */
- public AttributeValueProposalHelper[] getAttributeValueProposalHelpers(TagAttribSpec tas, String partialValue, int valueOffset, IJavaElement javaElement);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
deleted file mode 100644
index 6d99c21..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
+++ /dev/null
@@ -1,350 +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
- *******************************************************************************/
-/*
- * Created on Aug 25, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsCoreResources;
-
-/**
- * @author kelleyp Information on a single parameter for a tag. Parameters have names, and can be
- * marked as being required. (ie, not optional)
- */
-public class TagAttribSpec {
- private String attribName;
- private int flags;
- private String helpKey;
- private int type = Type.TEXT;
- private static final int FLG_REQUIRED = 1;
- private String[] validValues;
- private TagSpec tagSpec;
-
- /* Enum for type */
- public interface Type {
- public static final int TEXT = 0;
- public static final int BOOLEAN = 1;
- public static final int JAVATYPE = 2;
- public static final int ENUM = 3;
- }
-
- public class Unique {
- public static final int MODULE = 0;
- public static final int FILE = 1;
- public static final int TYPE = 2;
- public static final int METHOD = 3;
- public static final int FIELD = 4;
-
- private int scope = MODULE;
-
- public int getScope() {
- return scope;
- }
-
- public void setScope(int in) {
- scope = in;
- }
- }
-
- private Unique unique;
-
- public Unique getUnique() {
- return unique;
- }
-
- public boolean isUnique() {
- return unique != null;
- }
-
- public void setUnique() {
- unique = new Unique();
- }
-
- public void clearUnique() {
- unique = null;
- }
-
- /**
- * Converts a string representation of a tag attribute type to the integer representation.
- *
- * @param name
- * @return Integer type, defaults to TEXT if the type name is not recognized.
- */
- public static int typeNameToType(String name) {
- //TODO add enum
- if (name != null) {
- if (name.equalsIgnoreCase("text") || name.equalsIgnoreCase("string")) { //$NON-NLS-1$ //$NON-NLS-2$
- return Type.TEXT;
- } else if (name.equalsIgnoreCase("boolean") || name.equalsIgnoreCase("bool")) { //$NON-NLS-1$ //$NON-NLS-2$
- return Type.BOOLEAN;
- } else if (name.equalsIgnoreCase("javaType")) { //$NON-NLS-1$
- return Type.JAVATYPE;
- }
- }
- return Type.TEXT;
- }
-
- /**
- * Converts a type enum to a type string.
- *
- * @param ty
- * @return
- */
- public static String typeToTypeName(int ty) {
- switch (ty) {
- case Type.TEXT :
- return "string"; //$NON-NLS-1$
- case Type.BOOLEAN :
- return "bool"; //$NON-NLS-1$
- case Type.JAVATYPE :
- return "javaType"; //$NON-NLS-1$
- default :
- return "string"; //$NON-NLS-1$
- }
- }
-
- /**
- * Constructs a TagAttribSpec with <code>name</code> as the attribute name.
- *
- * @param name
- * Name for the attribute. Must not be null.
- * @throws IllegalArgumentException
- * if name is null.
- */
- public TagAttribSpec(String name) throws IllegalArgumentException {
- this(name, null);
- }
-
- public TagAttribSpec(String name, String hlpKey) {
- setAttribName(name);
- setHelpKey(hlpKey);
- }
-
- /**
- * Sets the type of this attribute.
- *
- * @param t
- * TEXT | BOOLEAN
- */
- public void setType(int t) {
- type = t;
- }
-
- /**
- * Sets the type of this attribute.
- *
- * @param typename
- * String representation, should be text or boolean.
- */
- public void setType(String typename) {
- type = typeNameToType(typename);
- }
-
- public int getType() {
- return type;
- }
-
- public boolean valueIsJavaType() {
- return type == Type.JAVATYPE;
- }
-
- public boolean valueIsText() {
- return type == Type.TEXT;
- }
-
- public boolean valueIsBool() {
- return type == Type.BOOLEAN;
- }
-
- /**
- * @return Name of the attribute.
- */
- public String getAttribName() {
- return attribName;
- }
-
- /**
- * Sets the attribute name. This can not be null.
- *
- * @param name
- * New name for the attribute.
- * @throws IllegalArgumentException
- * if the name is null.
- */
- public void setAttribName(String name) throws IllegalArgumentException {
- if (name == null) {
- throw new IllegalArgumentException(AnnotationsCoreResources.TagAttribSpec_6);
- }
- attribName = name;
- }
-
- /**
- *
- * @return true if this is a required attribute.
- */
- public boolean isRequired() {
- return (flags & FLG_REQUIRED) != 0;
- }
-
- /**
- * Sets the required flag for this attribute.
- */
- public void setRequired() {
- flags |= FLG_REQUIRED;
- }
-
- /**
- * Clears the required flag for this attribute.
- *
- */
- public void clearRequired() {
- flags &= (~FLG_REQUIRED);
- }
-
- /**
- *
- * @return The help key for this tag attribute. Should never return null.
- */
- public String getTextKey(int aType) {
- if (aType != TagSpec.HELP_TEXT) {
- return null;
- }
-
- if (helpKey == null) {
- helpKey = defaultHelpKey();
- }
- return helpKey;
- }
-
- /**
- * Formats the help text so it includes type and use information.
- */
- public String transformLocalizedText(String txt) {
- if (txt == null)
- return txt;
- StringBuffer buf = new StringBuffer(txt.length() + 50);
-
- buf.append("<b>Type: "); //$NON-NLS-1$
- buf.append(typeToTypeName(type));
- buf.append(", Use: "); //$NON-NLS-1$
- if (this.isRequired()) {
- buf.append("required"); //$NON-NLS-1$
- } else {
- buf.append("optional"); //$NON-NLS-1$
- }
- if (this.isUnique()) {
- buf.append(", unique:scope: "); //$NON-NLS-1$
- buf.append(TagAttribSpec.uniqueScopeToString(this.getUnique().getScope())); //$NON-NLS-1$
- }
- buf.append("</b><p>"); //$NON-NLS-1$
- buf.append(txt);
- buf.append("</p>"); //$NON-NLS-1$
- return buf.toString();
-
- }
-
- /**
- *
- * @return The help key for this tag attribute. Should never return null.
- */
- public String getHelpKey() {
- return getTextKey(TagSpec.HELP_TEXT);
- }
-
- /**
- * Sets the help key. Setting this to null resets the help key to the default help key.
- *
- * @param key
- */
- public void setHelpKey(String key) {
- helpKey = key;
- }
-
- /**
- * @return the default help key name for this tag.
- *
- */
- private String defaultHelpKey() {
- return "ath." + attribName; //$NON-NLS-1$
- }
-
- public static int uniqueScopeFromString(String scopeStr) {
- if (scopeStr != null) {
- if (scopeStr.equalsIgnoreCase("module"))return TagAttribSpec.Unique.MODULE; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("file"))return TagAttribSpec.Unique.FILE; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("type"))return TagAttribSpec.Unique.TYPE; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("method"))return TagAttribSpec.Unique.METHOD; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("field"))return TagAttribSpec.Unique.FIELD; //$NON-NLS-1$
- }
- Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_1 + scopeStr); //$NON-NLS-1$
- return TagAttribSpec.Unique.MODULE;
- }
-
- public static String uniqueScopeToString(int scope) {
- switch (scope) {
- case TagAttribSpec.Unique.MODULE :
- return "module"; //$NON-NLS-1$
- case TagAttribSpec.Unique.FILE :
- return "file"; //$NON-NLS-1$
- case TagAttribSpec.Unique.TYPE :
- return "type"; //$NON-NLS-1$
- case TagAttribSpec.Unique.METHOD :
- return "method"; //$NON-NLS-1$
- case TagAttribSpec.Unique.FIELD :
- return "field"; //$NON-NLS-1$
- default :
- Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_1 + scope); //$NON-NLS-1$
- return "unknown value"; //$NON-NLS-1$
-
- }
- }
-
- /**
- * @return Returns the validValues.
- */
- public String[] getValidValues() {
- return validValues;
- }
-
- /**
- * @param validValues
- * The validValues to set.
- */
- public void setValidValues(String[] validValues) {
- this.validValues = validValues;
- }
-
- public TagSpec getTagSpec() {
- return tagSpec;
- }
-
- void setTagSpec(TagSpec tagSpec) {
- this.tagSpec = tagSpec;
- }
-
- public String lookupTagHelp() throws MissingResourceException {
- ResourceBundle b = getTagSpec().getResourceBundle();
- if (b == null)
- return null;
- String key = getHelpKey();
- String val = b.getString(getHelpKey());
- if (val == key)
- val = null;
- return transformLocalizedText(val);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
deleted file mode 100644
index e36caca..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
+++ /dev/null
@@ -1,331 +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
- *******************************************************************************/
-/*
- * Created on Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * All of the information in a single tagSpec tag, including the enclosing handler.
- */
-public class TagSpec {
-
- /**
- * Handle to the descriptor of the plugin that declared the completion information for this tag,
- * if any.
- */
- Bundle bundle;
-
- protected ResourceBundle resourceBundle;
-
- private boolean attemptedToFindResourceBundle = false;
-
- private AttributeValuesHelper validValuesHelper;
- private TagsetDescriptor tagsetDescriptor;
-
- /**
- * Name of the tag.
- */
- private String tagName;
-
- /**
- * Scope of the tag: METHOD | FIELD | TYPE
- */
- private int scope;
-
- /**
- * Multiplicity of the tag: ONE | MANY
- */
- private int multiplicity;
-
- /**
- * Attributes that can be set for this tag. (Instances of TagAttribSpec)
- */
- private List attributes = new ArrayList();
-
- private String helpKey;
-
- /**
- * Text type for use with localized text container.
- */
- public static final int HELP_TEXT = 0;
-
- public static final int METHOD = 0;
-
- public static final int TYPE = 1;
-
- public static final int FIELD = 2;
-
- public interface Multiplicity {
- public static final int ONE = 1;
-
- public static final int MANY = 2;
- }
-
- public TagSpec(String aName, int aScope, int aMultiplicity) {
- tagName = aName;
- scope = aScope;
- multiplicity = aMultiplicity;
- }
-
- public static int scopeFromString(String s) throws CoreException {
- if (s != null) {
- if (s.equalsIgnoreCase("type")) { //$NON-NLS-1$
- return TagSpec.TYPE;
- } else if (s.equalsIgnoreCase("field")) { //$NON-NLS-1$
- return TagSpec.FIELD;
- } else if (s.equalsIgnoreCase("method")) { //$NON-NLS-1$
- return TagSpec.METHOD;
- } else {
- // Should be impossible unless the annotation-taghandler.exsd or
- // calling code changes.
- //TODO: Logging
- throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_3 + s, null)); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_4, null)); //$NON-NLS-1$ //$NON-NLS-2$
-
- }
-
- public static int multiplicityFromString(String s) throws CoreException {
- if (s != null) {
- if (s.equalsIgnoreCase("1")) { //$NON-NLS-1$
- return TagSpec.Multiplicity.ONE;
- } else if (s.equalsIgnoreCase("*")) { //$NON-NLS-1$
- return TagSpec.Multiplicity.MANY;
- }
- throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_4, null)); //$NON-NLS-1$ //$NON-NLS-2$
- }
- //Return default
- return TagSpec.Multiplicity.ONE;
- }
-
- /**
- * @return Scope for tag, METHOD | TYPE | FIELD
- */
- public int getScope() {
- return scope;
- }
-
- /**
- * @return multiplicity for tag, ONE | MANY
- */
- public int getMultiplicity() {
- return multiplicity;
- }
-
- /**
- * @return Name of the tag
- */
- public String getTagName() {
- return tagName;
- }
-
- public TagsetDescriptor getTagSetDescriptor() {
- if (tagsetDescriptor == null) {
- String tagSetName = getTagName();
- int index = tagSetName.lastIndexOf('.');
- if (index == -1)
- tagSetName = ""; //$NON-NLS-1$
- else
- tagSetName = tagSetName.substring(index + 1);
- tagsetDescriptor = AnnotationTagsetRegistry.INSTANCE.getDescriptor(tagSetName);
- }
- return tagsetDescriptor;
- }
-
- /**
- * Sets the scope of this tag.
- *
- * @param i
- * METHOD | TYPE | FIELD
- */
- public void setScope(int i) {
- scope = i;
- }
-
- /**
- * Sets the multiplicity of this tag.
- *
- * @param i
- * ONE | MANY
- */
- public void setMultiplicity(int i) {
- multiplicity = i;
- }
-
- /**
- * Sets the name of the tag
- *
- * @param string
- * Name for the tag.
- */
- public void setTagName(String string) {
- tagName = string;
- }
-
- /**
- *
- * @return List of attributes for this tag.
- */
- public List getAttributes() {
- return attributes;
- }
-
- /**
- * Adds an attribute to the list of attributes for this tag.
- *
- * @param att
- * A TagAttribSpec
- */
- public void addAttribute(TagAttribSpec att) {
- if (att == null)
- return;
- attributes.add(att);
- att.setTagSpec(this);
- }
-
- /**
- * Sets the list of attributes for this tag.
- *
- * @param lst
- * An array list of TagAttribSpecs
- */
- public void setAttributes(List lst) {
- if (lst == null)
- attributes.clear();
- else {
- attributes = lst;
- for (int i = 0; i < lst.size(); i++) {
- TagAttribSpec tas = (TagAttribSpec) lst.get(i);
- tas.setTagSpec(this);
- }
- }
- }
-
- /**
- * Looks for attribute named <code>attName</code>. Case insensitive.
- *
- * @param attName
- * Name to look for
- * @return A TagAttribSpec, or null if none was found.
- */
- public TagAttribSpec attributeNamed(String attName) {
- Iterator i = getAttributes().iterator();
-
- while (i.hasNext()) {
- TagAttribSpec tas = (TagAttribSpec) i.next();
-
- if (attName.equalsIgnoreCase(tas.getAttribName())) {
- return tas;
- }
- }
- return null;
-
- }
-
- /**
- * @return Returns the declaringPlugin.
- */
- public Bundle getBundle() {
- return bundle;
- }
-
- /**
- * @param declaringPlugin
- * The declaringPlugin to set.
- */
- protected void setBundle(Bundle bundle) {
- this.bundle = bundle;
- }
-
- /**
- * @return Returns the resourceBundle.
- */
- public ResourceBundle getResourceBundle() {
- if (resourceBundle == null && !attemptedToFindResourceBundle) {
- attemptedToFindResourceBundle = true;
- Bundle aBundle = getBundle();
- if (aBundle != null)
- resourceBundle = Platform.getResourceBundle(bundle);
- }
- return resourceBundle;
- }
-
- /**
- * @param resourceBundle
- * The resourceBundle to set.
- */
- public void setResourceBundle(ResourceBundle resourceBundle) {
- attemptedToFindResourceBundle = false;
- this.resourceBundle = resourceBundle;
- }
-
- /**
- * @return Returns the validValuesHelper.
- */
- public AttributeValuesHelper getValidValuesHelper() {
- if (validValuesHelper == null && getTagSetDescriptor() != null)
- setValidValuesHelper(getTagSetDescriptor().getValidValuesHelper());
- return validValuesHelper;
- }
-
- /**
- * @param validValuesHelper
- * The validValuesHelper to set.
- */
- public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
- this.validValuesHelper = validValuesHelper;
- }
-
- public String getHelpKey() {
- if (helpKey == null)
- helpKey = computeHelpKey();
- return helpKey;
- }
-
- /**
- * @return
- */
- protected String computeHelpKey() {
- return "tagh." + getTagName(); //$NON-NLS-1$
- }
-
- public void setHelpKey(String helpKey) {
- this.helpKey = helpKey;
- }
-
- public String lookupTagHelp() throws MissingResourceException {
- ResourceBundle b = getResourceBundle();
- if (b == null)
- return null;
- String key = getHelpKey();
- String val = b.getString(getHelpKey());
- if (val == key)
- val = null;
- return val;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
deleted file mode 100644
index 8e4c4da..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
+++ /dev/null
@@ -1,146 +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
- *******************************************************************************/
-/*
- * Created on Apr 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
- * @author mdelder
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class TagsetDescriptor {
-
- public static final String TAGSET = "AnnotationTagSet"; //$NON-NLS-1$
- public static final String ATT_NAME = "name"; //$NON-NLS-1$
- public static final String ATT_DISPLAY_NAME = "displayName"; //$NON-NLS-1$
- public static final String ATT_DESCRIPTION = "description"; //$NON-NLS-1$
- public static final String ATT_PARENT_TAGSET = "parentTagset"; //$NON-NLS-1$
- public static final String ATT_VALID_VALUES_HELPER = "validValuesHelper"; //$NON-NLS-1$
-
- private final IConfigurationElement element;
-
- protected String name;
- protected String displayName;
- protected String description;
- protected String parentTagset;
- protected AttributeValuesHelper validValuesHelper;
-
- protected TagsetDescriptor() {
- element = null;
- }
-
- public TagsetDescriptor(IConfigurationElement element) {
- this.element = element;
- init();
- }
-
- /**
- *
- */
- private void init() {
- this.name = this.element.getAttribute(ATT_NAME);
- this.displayName = this.element.getAttribute(ATT_DISPLAY_NAME);
- this.description = this.element.getAttribute(ATT_DESCRIPTION);
- this.parentTagset = this.element.getAttribute(ATT_PARENT_TAGSET);
- // set the valid values helper if there is one
- try {
- String validValuesHelperName = this.element.getAttribute(ATT_VALID_VALUES_HELPER);
- if (validValuesHelperName != null) {
- Class loaded = Class.forName(validValuesHelperName);
- this.validValuesHelper = (AttributeValuesHelper) loaded.newInstance();
- }
- } catch (Exception e) {
- // Do nothing
- }
- }
-
- /**
- * @return Returns the description.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @return Returns the displayName.
- */
- public String getDisplayName() {
- return displayName;
- }
-
- /**
- * @return Returns the element.
- */
- public IConfigurationElement getElement() {
- return element;
- }
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return Returns the parentTagset.
- */
- public String getParentTagset() {
- return parentTagset;
- }
-
- public TagsetDescriptor[] getDirectDependents() {
-
- if (getName() == null || getName().equals("")) //$NON-NLS-1$
- return new TagsetDescriptor[0];
-
- List dependents = new ArrayList();
-
- TagsetDescriptor descriptor = null;
- for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
- descriptor = (TagsetDescriptor) itr.next();
- if (getName().equals(descriptor.getParentTagset()))
- dependents.add(descriptor);
- }
-
- TagsetDescriptor[] descriptors = new TagsetDescriptor[dependents.size()];
- dependents.toArray(descriptors);
- return descriptors;
- }
-
- /**
- * @return Returns the validValuesHelper.
- */
- public AttributeValuesHelper getValidValuesHelper() {
- return validValuesHelper;
- }
-
- /**
- * @param validValuesHelper
- * The validValuesHelper to set.
- */
- public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
- this.validValuesHelper = validValuesHelper;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties b/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties
deleted file mode 100644
index 475ed7e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-Annotations_Controller=Annotations Controller
-annotation_tag_info=annotation tag info
-annotation_tagset=annotation tagset
-annotationTagDynamicInitializer=annotationTagDynamicInitializer
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml b/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
deleted file mode 100644
index 990fda0..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="annotationsController" name="%Annotations_Controller" schema="schema/annotationsController.exsd"/>
- <extension-point id="AnnotationTagInfo" name="%annotation_tag_info" schema="schema/annotation-tag-info.exsd"/>
- <extension-point id="AnnotationTagSet" name="%annotation_tagset" schema="schema/annotation.tagset.exsd"/>
- <extension-point id="annotationTagDynamicInitializer" name="%annotationTagDynamicInitializer" schema="schema/annotationTagDynamicInitializer.exsd"/>
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
deleted file mode 100644
index 833fffa..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.annotations.controller"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties b/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
deleted file mode 100644
index a2631de..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
+++ /dev/null
@@ -1,24 +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
-###############################################################################
-TagSpec_3=Unknown tag scope:
-TagSpec_4=Null tag scope.
-TagSpec_5=Unknown tag multiplicity:
-TagSpec_6=Null tag multiplicity.
-TagAttribSpec_1=Unknown 'unique' scope value:
-TagAttribSpec_2=More than one 'unique' tag defined:
-AnnotationTagParser_0=Null event handler.
-AnnotationTagParser_1=
-AnnotationTagRegistry_0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry_9=parseTagAttribs: unknown 'use' value:
-AnnotationTagRegistry_10=Incomplete element AnnotationTagInfo in plugin {0}
-AnnotationTagRegistry_11=parseTagAttribs: unknown 'isJavaTypeIdentifier' value:
-AnnotationsControllerManager_ERROR_0=IWAE0001E Invalid IConfigurationElement used to create AnnotationsControllerRegistry.Descriptor.
-AnnotationTagRegistry_ERROR_1=
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
deleted file mode 100644
index 75cebf8..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="AnnotationTagInfo" name="Annotation Tag Info"/>
- </appInfo>
- <documentation>
- Describes the tags contained by a tag set and the tag's attributes.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="AnnotationTagInfo" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="AnnotationTagInfo">
- <complexType>
- <sequence>
- <element ref="attrib" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="tagSet" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tag set this tag comes underneath. ( for instance, if we're defining the <code>@ejb.bean</code>
-tag, then the tag set would be <code>ejb</code>. ) The tag set must have been defined using the annotation.tagset extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="tagName" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tag. ( if we're defining the <code>@ejb.bean</code> tag, then the tagName would be <code>bean</code> ).
- </documentation>
- </annotation>
- </attribute>
- <attribute name="scope" use="required">
- <annotation>
- <documentation>
- Scope of the bean. Must be <code>type</code>,<code>method</code>, or <code>field</code>.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="type">
- </enumeration>
- <enumeration value="method">
- </enumeration>
- <enumeration value="field">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="multiplicity" use="default" value="1">
- <annotation>
- <documentation>
- Multiplicity of the tagset. Must be <code>1</code> or<code>*</code>. The default value is 1, if not specified.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="1">
- </enumeration>
- <enumeration value="*">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- Optional description. May be a description string, or a
-key to localized text for the description in the declaring plugin's resource bundle. No default if this is
-not specified.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="attrib">
- <complexType>
- <sequence>
- <element ref="unique" minOccurs="0" maxOccurs="1"/>
- <element ref="enumValues" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- Name of the attribute.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- Description text for the attribute, or key pointing to the localized description text inside of the declaring plugin's resource bundle. If not specified, defaults to <code>ath.ATTRIBUTE_NAME</code>.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="use" use="default" value="optional">
- <annotation>
- <documentation>
- Sets whether this tag is <code>optional</code> or <code>required</code>. The default is <code>optional</code>.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="optional">
- </enumeration>
- <enumeration value="required">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="type" use="default" value="string">
- <annotation>
- <documentation>
- Type of the attribute, <code>string|boolean|javaType</code>. Defaults to <code>string</code> if not specified.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="string">
- </enumeration>
- <enumeration value="bool">
- </enumeration>
- <enumeration value="javaType">
- </enumeration>
- <enumeration value="enum">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="unique">
- <annotation>
- <documentation>
- Specifies that the attribute value is unique within the specified scope.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="scope" use="default" value="module">
- <annotation>
- <documentation>
- The scope of the uniqueness for the attribute value. It is one of the <code>module</code>, <code>file</code>, <code>type</code>, <code>method</code>,or <code>field</code>. The default value is 'module'.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="module">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="type">
- </enumeration>
- <enumeration value="method">
- </enumeration>
- <enumeration value="field">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="enumValues">
- <complexType>
- <attribute name="value" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
deleted file mode 100644
index 9faf3c1..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="AnnotationTagSet" name="Annotations Tag Set"/>
- </appInfo>
- <documentation>
- Allows clients to define a tag set for an annotation
-tag. A tag set named X would contain all of the tags that
-look like <code>@X.tag</code>. So the <code>ejb</code>
-tag set would contain the <code>@ejb.bean</code> tag,
-the <code>@ejb.persistence</code> tag, the <code>@ejb.pk</code> tag, etc...
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="AnnotationTagSet" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="AnnotationTagSet">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tagset. The name for the tagset that contains the <code>@ejb.bean</code> tag would be <code>ejb</code>.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="displayName" type="string">
- <annotation>
- <documentation>
- The text of the display name for the tag, or a resource
-key pointing to the localized display name inside of the
-declaring plugin's resource bundle.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of the tag set. Can be the text of the
-description, or a key for the declaring plugin's resource bundle that points to the localized text for the tag set description.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="parentTagset" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="validValuesHelper" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
deleted file mode 100644
index 3eab09e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="annotationTagDynamicInitializer" name="Annotation Tag Dynamic Initializer"/>
- </appInfo>
- <documentation>
- This extension point is used to allow for clients to define their annotation tags dynamically. This means that it is not necessary to statically define annotation tags using the tag-info extension point. The extensions for this point will be called just after initializing the static annotation tags from the tag-info extension point.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="initializer"/>
- </sequence>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="initializer">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- Set the qualified name of a class that implements the com.ibm.wtp.annotations.registry.AnnotationTagDynamicInitializer interface. This class must have a default constructor.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
deleted file mode 100644
index a7c5daa..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="annotationsController" name="Annotations Controller"/>
- </appInfo>
- <documentation>
- The annotationsController is used in generating annotated beans.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="annotationsController" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="annotationsController">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The id is used to coordinate precedence using function groups so this must be consistent with the function group bindings.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This is the name of the extension class defined by the extension
- </documentation>
- </annotation>
- </attribute>
- <attribute name="builderID" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID of the annotations builder to be used by this annotations controller.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.classpath b/plugins/org.eclipse.jst.common.annotations.core/.classpath
deleted file mode 100644
index ccf4d76..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore b/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
deleted file mode 100644
index abd5a75..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-annotations-core.jar
-build.xml
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.project b/plugins/org.eclipse.jst.common.annotations.core/.project
deleted file mode 100644
index 51f02e3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.annotations.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index e92ddd6..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation Core Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.common.internal.annotations.core
-Require-Bundle: org.eclipse.emf.ecore,
- org.eclipse.wst.common.emf,
- org.eclipse.core.runtime,
- org.eclipse.jem.util,
- org.eclipse.jdt.core
diff --git a/plugins/org.eclipse.jst.common.annotations.core/about.html b/plugins/org.eclipse.jst.common.annotations.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/build.properties b/plugins/org.eclipse.jst.common.annotations.core/build.properties
deleted file mode 100644
index 9e0d1c1..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-bin.includes = plugin.xml,\
- META-INF/,\
- about.html,\
- .,\
- schema/
-src.includes=schema/
-jars.compile.order = .
-output.. = bin/
-source.. = src/,\
- property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml b/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
deleted file mode 100644
index 1ce894f..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="annotationsProvider" name="Annotations Provider" schema="schema/annotationsProvider.exsd"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
deleted file mode 100644
index 87718a6..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.annotations.core"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties b/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
deleted file mode 100644
index 19a34cc..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-TagSpec_3=Unknown tag scope:
-TagSpec_4=Null tag scope.
-TagAttribSpec_6=
-AnnotationTagParser_0=Null event handler.
-AnnotationTagParser_1=
-AnnotationTagRegistry_0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry_9=parseTagAttribs: unknown 'use' value:
diff --git a/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd b/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd
deleted file mode 100644
index 960dce2..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.core" id="annotationsProvider" name="Annotations Provider"/>
- </appInfo>
- <documentation>
- [This extension point is used by clients to allow their own annotation provider to detail information on whether or not a given EObject is annotated for one of their tag sets.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="annotationsProvider" 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="annotationsProvider">
- <complexType>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- A fully qualified class name for a class which implments the IAnnotationsProvider interface.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [1.0.2]
- </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>
- [This is for internal use only.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
deleted file mode 100644
index 47767e3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
+++ /dev/null
@@ -1,74 +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.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class AnnotatedCommentHandler implements TagParseEventHandler {
-
- private Map annotations;
-
- private Token annotationToken;
-
- /**
- *
- */
- public AnnotatedCommentHandler() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#annotationTag(org.eclipse.wst.common.internal.annotations.core.Token)
- */
- public void annotationTag(Token tag) {
- this.annotationToken = tag;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#endOfTag(int)
- */
- public void endOfTag(int pos) {
- // Do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#attribute(org.eclipse.wst.common.internal.annotations.core.Token,
- * int, org.eclipse.wst.common.internal.annotations.core.Token)
- */
- public void attribute(Token name, int equalsPosition, Token value) {
- if (value.getText() == null || value.getText().length() == 0)
- getAnnotations().put(this.annotationToken.getText(), name.getText());
- else
- getAnnotations().put(name.getText(), value.getText());
- }
-
- /**
- * @return Returns the annotations.
- */
- public Map getAnnotations() {
- if (annotations == null)
- annotations = new HashMap();
- return annotations;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
deleted file mode 100644
index 6196693..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
+++ /dev/null
@@ -1,266 +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
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * @author Pat Kelley
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AnnotationTagParser {
-
- private TagParseEventHandler handler;
-
- private char[] input;
-
- int pos;
-
- int endOfLastGoodAttParse;
-
- public AnnotationTagParser(TagParseEventHandler tp) {
- if (tp == null) {
- throw new IllegalArgumentException(AnnotationsCoreResources.AnnotationTagParser_0);
- }
- handler = tp;
- }
-
- private boolean eos() {
- return pos >= input.length;
- }
-
- private boolean isWS(char c) {
- return c == ' ' || c == '\n' || c == '\r' || c == '\t';
- }
-
- private void skipWS() {
- while (pos < input.length && (isWS(input[pos]) || input[pos] == '*')) {
- pos++;
- }
- }
-
- // Caller is expected to make sure the eos has not been reached.
- private char peek() {
- return input[pos];
- }
-
- // Caller is expected to check for EOS.
- private char nextChar() {
- return input[pos++];
- }
-
- private boolean isNextChar(char c) {
- if (eos())
- return false;
- return peek() == c;
- }
-
- private boolean isIDChar(char c) {
- return !isWS(c) && c != '=' && c != '@' && c != '\"';
- }
-
- private Token collectID() {
- StringBuffer b = new StringBuffer(16);
- Token t = new Token();
-
- t.setBeginning(pos);
- while (!eos() && isIDChar(peek())) {
- b.append(nextChar());
- }
- t.setEnd(pos - 1);
- t.setText(b.toString());
- return t;
- }
-
- private Token expectAttribName() {
- if (eos()) {
- return null;
- }
- int save = pos;
-
- Token retval = collectID();
- if (retval.length() == 0) {
- pos = save;
- return null;
- }
- return retval;
- }
-
- private Token expectTag() {
- if (eos()) {
- return null;
- }
- int savePos = pos;
-
- if (nextChar() != '@') {
- return null;
- }
-
- if (eos() || isWS(peek())) {
- return null;
- }
-
- Token retval = expectAttribName();
-
- if (retval.length() == 0) {
- pos = savePos + 1;
- }
- retval.setBeginning(savePos);
-
- // Save end of parse so we can pass it as the end of the parsed tag.
- endOfLastGoodAttParse = pos;
- return retval;
- }
-
- private Token expectQuotedValue() {
- skipWS();
- if (eos()) {
- return null;
- }
-
- Token tok = new Token();
-
- tok.setBeginning(pos);
- if (peek() != '\"') {
- return null;
- }
- nextChar();
-
- if (eos()) {
- return null;
- }
-
- StringBuffer b = new StringBuffer(64);
-
- while (!eos() && peek() != '\"') {
- b.append(nextChar());
- }
- if (!eos()) {
- nextChar();
- }
-
- tok.setEnd(pos - 1);
- tok.setText(b.toString());
- return tok;
- }
-
- private boolean expectAssign() {
- if (eos()) {
- return false;
- }
-
- if (nextChar() == '=') {
- return true;
- }
- pos--;
- return false;
- }
-
- private Token mkNullToken() {
- Token retval = new Token();
-
- retval.setBeginning(pos);
- retval.setEnd(pos - 1);
- retval.setText(""); //$NON-NLS-1$
- return retval;
- }
-
- private boolean parseNextAttribute() {
- skipWS();
- if (eos()) {
- return false;
- }
- Token key = collectID();
-
- if (key == null || key.length() == 0) {
- return false;
- }
-
- skipWS();
- if (eos()) {
- // Go ahead and report it, even though it is a partial attribute. (
- // we still fail here )
- handler.attribute(key, -1, mkNullToken());
- return false;
- }
-
- int eqPos = pos;
-
- if (!expectAssign()) {
- // Even though we won't parse this as a full attribute, go ahead and
- // call the handler with it. Some clients want to see partial
- // attributes.
- handler.attribute(key, -1, mkNullToken());
- return false;
- }
- skipWS();
-
- if (eos()) {
- // Same here - we fail on it, but we report it anyway
- handler.attribute(key, eqPos, mkNullToken());
- return false;
- }
- Token value = expectQuotedValue();
-
- if (value == null) {
- value = collectID();
- if (isNextChar('=')) {
- pos = value.getBeginning();
- value = mkNullToken();
- }
- }
- endOfLastGoodAttParse = pos;
- handler.attribute(key, eqPos, value);
- return true;
- }
-
- private void parseAttributes() {
- while (!eos() && parseNextAttribute()) {
- // loop while not end of string
- }
- }
-
- private void skipToTagChar() {
- while (!eos() && peek() != '@') {
- nextChar();
- }
- }
-
- public void setParserInput(char[] text) {
- input = text;
- pos = 0;
- endOfLastGoodAttParse = 0;
- }
-
- public void setParserInput(String text) {
- setParserInput(text.toCharArray());
- }
-
- public void parse() {
- while (!eos()) {
- skipToTagChar();
- Token tag = expectTag();
- if (tag == null) {
- break;
- }
- handler.annotationTag(tag);
- parseAttributes();
- handler.endOfTag(endOfLastGoodAttParse);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
deleted file mode 100644
index d9431cf..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
+++ /dev/null
@@ -1,161 +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.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.CloneablePublic;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class AnnotationsAdapter extends AdapterImpl implements CloneablePublic {
-
- public static final String GENERATED = "generated"; //$NON-NLS-1$
-
- protected final static String ADAPTER_TYPE = AnnotationsAdapter.class.getName();
-
- public final static EStructuralFeature NOTIFICATION_FEATURE = new EStructuralFeatureImpl() {
- // anonymous inner class
- };
-
- private Map annotationsMap;
-
- /**
- *
- */
- public AnnotationsAdapter() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#clone()
- */
- public Object clone() { // throws CloneNotSupportedException {
- //return super.clone();
- return null;
- }
-
- /**
- * @param emfObject
- * @param string
- */
- public static void addAnnotations(EObject emfObject, String name, Object value) {
- if (emfObject == null)
- return;
- AnnotationsAdapter adapter = getAdapter(emfObject);
- adapter.addAnnotations(name, value);
- }
-
-
- /**
- * @param emfObject
- * @param string
- */
- public static Object getAnnotations(EObject emfObject, String name) {
- if (emfObject == null)
- return null;
- return internalGetAnnotations(emfObject, name);
- }
-
- protected static Object internalGetAnnotations(EObject emfObject, String name) {
- if (emfObject == null)
- return null;
- AnnotationsAdapter adapter = getAdapter(emfObject);
- return (adapter == null) ? internalGetAnnotations(emfObject.eContainer(), name) : adapter.getAnnotations(name);
- }
-
-
- /**
- * @param emfObject
- * @param string
- */
- public static Object removeAnnotations(EObject emfObject, String name) {
- if (emfObject == null)
- return null;
- AnnotationsAdapter adapter = getAdapter(emfObject);
- return adapter.removeAnnotations(name);
- }
-
- /**
- * @param name
- * @param value
- */
- protected void addAnnotations(String name, Object value) {
- getAnnnotations().put(name, value);
- }
-
- protected Object getAnnotations(String name) {
- return getAnnnotations().get(name);
- }
-
- protected Object removeAnnotations(String name) {
- return getAnnnotations().remove(name);
- }
-
- /**
- * @return
- */
- protected Map getAnnnotations() {
- if (annotationsMap == null)
- annotationsMap = new HashMap();
- return annotationsMap;
- }
-
- /**
- * @param emfObject
- * @return
- */
- protected static AnnotationsAdapter getAdapter(EObject emfObject) {
- AnnotationsAdapter adapter = retrieveExistingAdapter(emfObject);
- return adapter == null ? createAdapter(emfObject) : adapter;
- }
-
- /**
- * @param emfObject
- * @return
- */
- protected static AnnotationsAdapter createAdapter(EObject emfObject) {
- AnnotationsAdapter adapter = new AnnotationsAdapter();
- adapter.setTarget(emfObject);
- emfObject.eAdapters().add(adapter);
- return adapter;
- }
-
- /**
- * @param emfObject
- * @return
- */
- protected static AnnotationsAdapter retrieveExistingAdapter(EObject emfObject) {
- return (AnnotationsAdapter) EcoreUtil.getExistingAdapter(emfObject, ADAPTER_TYPE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return ADAPTER_TYPE.equals(type);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
deleted file mode 100644
index 81b8276..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
+++ /dev/null
@@ -1,34 +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.jst.common.internal.annotations.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AnnotationsCoreResources extends NLS {
-
- private static final String BUNDLE_NAME = "annotationcore";//$NON-NLS-1$
-
- private AnnotationsCoreResources() {
- // Do not instantiate
- }
-
- public static String TagSpec_3;
- public static String TagSpec_4;
- public static String TagAttribSpec_6;
- public static String AnnotationTagParser_0;
- public static String AnnotationTagParser_1;
- public static String AnnotationTagRegistry_0;
- public static String AnnotationTagRegistry_9;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AnnotationsCoreResources.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java
deleted file mode 100644
index 0f98b62..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-public class AnnotationsProviderManager extends RegistryReader {
-
- public static final AnnotationsProviderManager INSTANCE = new AnnotationsProviderManager();
-
- static {
- INSTANCE.readRegistry();
- }
-
- public static class Descriptor {
-
- public static final String EXTENSION_PT_PLUGIN = "org.eclipse.jst.common.annotations.core"; //$NON-NLS-1$
- public static final String ANNOTATIONS_PROVIDER = "annotationsProvider"; //$NON-NLS-1$
- public static final String CLASSNAME = "className"; //$NON-NLS-1$
-
- private final IConfigurationElement configElement;
-
- public Descriptor(IConfigurationElement aConfigElement) {
- super();
- configElement = aConfigElement;
- }
-
- public IAnnotationsProvider createInstance() {
- IAnnotationsProvider instance = null;
- try {
- instance = (IAnnotationsProvider) configElement.createExecutableExtension(CLASSNAME);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return instance;
- }
- }
-
- private List annotationsProviders;
-
- /**
- * Default constructor
- */
- public AnnotationsProviderManager() {
- super(Descriptor.EXTENSION_PT_PLUGIN, Descriptor.ANNOTATIONS_PROVIDER);
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(Descriptor.ANNOTATIONS_PROVIDER))
- return false;
- addAnnotationsProvider(new Descriptor(element));
- return true;
- }
-
- /**
- * @param descriptor
- */
- protected void addAnnotationsProvider(Descriptor descriptor) {
- IAnnotationsProvider provider = descriptor.createInstance();
- if (provider != null)
- getAnnotationsProviders().add(provider);
- }
-
- /**
- * @return Returns the annotationsProviders.
- */
- public List getAnnotationsProviders() {
- if (annotationsProviders == null)
- annotationsProviders = new ArrayList();
- return annotationsProviders;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
deleted file mode 100644
index f110ad3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
+++ /dev/null
@@ -1,150 +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.jst.common.internal.annotations.core;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class AnnotationsTranslator extends Translator {
-
- private AnnotatedCommentHandler handler;
-
- private AnnotationTagParser parser;
-
- public static final AnnotationsTranslator INSTANCE = new AnnotationsTranslator();
-
- /**
- * @param domNameAndPath
- * @param aFeature
- */
- public AnnotationsTranslator() {
- super("#comment", AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE); //$NON-NLS-1$
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- */
- public AnnotationsTranslator(String domNameAndPath) {
- super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param style
- */
- public AnnotationsTranslator(String domNameAndPath, int style) {
- super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, style | Translator.COMMENT_FEATURE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.emf.xml.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
- * java.lang.Object)
- */
- public void setMOFValue(EObject emfObject, Object value) {
- if (value == null)
- return;
- getHandler().getAnnotations().clear();
- getParser().setParserInput(value.toString());
- getParser().parse();
- String name;
- Map annotations = getHandler().getAnnotations();
- for (Iterator keys = annotations.keySet().iterator(); keys.hasNext();) {
- name = (String) keys.next();
- AnnotationsAdapter.addAnnotations(emfObject, name, annotations.get(name));
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public boolean isSetMOFValue(EObject emfObject) {
- return getMOFValue(emfObject) != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public Object getMOFValue(EObject emfObject) {
- return AnnotationsAdapter.getAnnotations(emfObject, AnnotationsAdapter.GENERATED);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public void unSetMOFValue(EObject emfObject) {
- AnnotationsAdapter.removeAnnotations(emfObject, AnnotationsAdapter.GENERATED);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
- */
- public boolean featureExists(EObject emfObject) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
- */
- public boolean isDataType() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
- * java.lang.Object)
- */
- public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
- return (aFeature == feature);
- }
-
- /**
- * @return Returns the handler.
- */
- protected AnnotatedCommentHandler getHandler() {
- if (handler == null)
- handler = new AnnotatedCommentHandler();
- return handler;
- }
-
- /**
- * @return Returns the parser.
- */
- protected AnnotationTagParser getParser() {
- if (parser == null)
- parser = new AnnotationTagParser(getHandler());
- return parser;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java
deleted file mode 100644
index 1d1f3b1..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jst.common.internal.annotations.core;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-
-/**
- * This interface is used by clients to allow their own annotation provider to detail information
- * on whether or not a given EObject is annotated for one of their tag sets.
- *
- * @author jlanuti
- * @planned for 2.0
- */
-public interface IAnnotationsProvider {
-
- /**
- * Return whether or not the passed EObject is annotated by your annotation provider
- *
- * @planned for 2.0
- * @param eObject
- * @return boolean value of isAnnotated
- */
- public boolean isAnnotated(EObject eObject);
-
- /**
- * The passed eObject may have been annoted. If true, it is desired to
- * determine which {@link ICompilationUnit} has the tag or tags that created
- * this object.
- *
- * @planned for 2.0
- * @param eObject - An {@link EObject} that may be annotated.
- * @return the {@link ICompilationUnit} that has the tag that created this eObject.
- *
- * @see #getPrimaryTagset(EObject)
- */
- public ICompilationUnit getPrimaryAnnotatedCompilationUnit(EObject eObject);
-
- /**
- * It is desired to obtain the tagset name which is used to create the passed
- * eObject.
- *
- * @planned for 2.0
- * @param eObject An {@link EObject} which may be annotated.
- * @return The name of the tagset which creates the passed eObject.
- *
- * @see #getPrimaryAnnotatedCompilationUnit(EObject)
- */
- public String getPrimaryTagset(EObject eObject);
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
deleted file mode 100644
index f979415..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-
-/**
- * Parser and interface for objects that want to receive parsing events. When parsing is started
- * through the <code>parse()</code> method, event methods are called for interesting features in
- * the parse. ( like a SAX ContentHandler )
- *
- * @author Pat Kelley
- */
-public interface TagParseEventHandler {
-
- /**
- * Called when the annotation tag is encountered. This will always be the first piece of content
- * encountered. Followed by a endOfTag( ) call when the end of the tag is reached.
- */
- public void annotationTag(Token tag);
-
- /**
- * Called when the entire annotation for a single tag has been parsed.
- *
- * @param pos
- * Position in the stream of the end of the annotation.
- */
- public void endOfTag(int pos);
-
- /**
- * Called for every attribute setting encountered for an annotation tag.
- *
- * @param name
- * Name of the attribute.
- * @param equalsPosition
- * Source position of the equals sign, or -1 if no equals sign was found.
- * @param value
- * Value of the attribute, with any quotes stripped off. Will be zero length token if
- * no attribute was found.
- */
- public void attribute(Token name, int equalsPosition, Token value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
deleted file mode 100644
index 9d03102..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
+++ /dev/null
@@ -1,103 +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
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * A string, and the range it was taken from in the source file. The range is inclusive. (ie, with
- * source "ABCD", the beginning and end for the Token "BC" would be (1,2) )
- *
- * @author Pat Kelley
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class Token {
- private String text;
- private int beginning;
- private int end;
-
-
-
- /**
- * @return Position in original source of the first character of this token.
- */
- public int getBeginning() {
- return beginning;
- }
-
- /**
- * @return Position in the original source of the last character of this token.
- */
- public int getEnd() {
- return end;
- }
-
- /**
- * @return The token string.
- */
- public String getText() {
- return text;
- }
-
- /**
- * @param i
- * A source position
- */
- public void setBeginning(int i) {
- beginning = i;
- }
-
- /**
- * @param i
- * A source position.
- */
- public void setEnd(int i) {
- end = i;
- }
-
- /**
- * @param string
- */
- public void setText(String string) {
- text = string;
- }
-
- public int length() {
- return text.length();
- }
-
- /**
- * Tests whether <code>srcPos</code> comes immediately after the last character in this token.
- *
- * @param srcPos
- * A position in the original source the token came from.
- * @return true if srcPos comes immediately after this token.
- */
- public boolean immediatelyPrecedes(int srcPos) {
- return end + 1 == srcPos;
- }
-
- /**
- * Tests whether srcPos is within the original source range range of the token.
- *
- * @param srcPos
- * @return
- */
- public boolean contains(int srcPos) {
- return srcPos >= beginning && srcPos <= end;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.classpath b/plugins/org.eclipse.jst.common.annotations.ui/.classpath
deleted file mode 100644
index ccf4d76..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore b/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
deleted file mode 100644
index 80fffc1..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.project b/plugins/org.eclipse.jst.common.annotations.ui/.project
deleted file mode 100644
index 04b8576..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.annotations.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0a99308..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotations UI Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.common.internal.annotations.ui.UiPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.common.internal.annotations.ui
-Require-Bundle: org.eclipse.ui.views,
- org.eclipse.ui.editors,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.core,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.swt,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime,
- org.eclipse.jst.common.annotations.controller,
- org.eclipse.wst.common.emf,
- org.eclipse.jst.common.annotations.core
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/about.html b/plugins/org.eclipse.jst.common.annotations.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/build.properties b/plugins/org.eclipse.jst.common.annotations.ui/build.properties
deleted file mode 100644
index a21afc6..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-bin.includes = plugin.xml,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- .
-src.includes=schema/
-jars.compile.order = .
-output.. = bin/
-source.. = src/,\
- property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties b/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties
deleted file mode 100644
index f69ce42..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-AnnotationsCompletionProcessor=AnnotationsCompletionProcessor
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml b/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
deleted file mode 100644
index efa96ed..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.jdt.ui.javadocCompletionProcessor">
- <javadocCompletionProcessor
- name="%AnnotationsCompletionProcessor"
- class="org.eclipse.jst.common.internal.annotations.ui.AnnotationTagCompletionProc"
- id="AnnotationsCompletionProcessor">
- </javadocCompletionProcessor>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
deleted file mode 100644
index 9a4918e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.annotations.ui"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties b/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
deleted file mode 100644
index 2d29099..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
+++ /dev/null
@@ -1,12 +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
-###############################################################################
-J2EEAnnotationsCompletionProcessor_3=Error parsing attributes - was expecing a '=' but found '
-J2EEAnnotationsCompletionProcessor_4=' instead.
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd b/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
deleted file mode 100644
index b3af9ec..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.ui" id="AnnotationUI" name="AnnotationUI"/>
- </appInfo>
- <documentation>
- Extension point for enabling content assist for an existing tag set.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="AutoCompleteData" minOccurs="0" 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>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="AutoCompleteData">
- <annotation>
- <documentation>
- Enables content assist for a single tag set.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="tagSet" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tag set code assist should be enabled for.
- </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>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
deleted file mode 100644
index 8870163..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
+++ /dev/null
@@ -1,726 +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
- *******************************************************************************/
-/*
- * Created on Mar 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationTagParser;
-import org.eclipse.jst.common.internal.annotations.core.TagParseEventHandler;
-import org.eclipse.jst.common.internal.annotations.core.Token;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationTagRegistry;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValuesHelper;
-import org.eclipse.jst.common.internal.annotations.registry.TagAttribSpec;
-import org.eclipse.jst.common.internal.annotations.registry.TagSpec;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-
-/**
- * @author Pat Kelley
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagCompletionProc implements IJavadocCompletionProcessor, TagParseEventHandler {
- private static final String[] BOOLEAN_VALID_VALUES = new String[]{"false", "true"}; //$NON-NLS-1$ //$NON-NLS-2$
- ICompilationUnit m_icu;
-
- IDocument m_doc;
-
- List m_tags;
-
- // Instance variables active when maybeCompleteAttribute is live.
- Token m_tagName;
-
- /**
- * Set of all attributes names encountered. Only live when maybeCompleteAttribute is live.
- */
- Set m_attSet = new TreeSet();
-
- /**
- * List of Attribute. Only live when maybeCompleAttribute is live.
- */
- List m_attributes = new ArrayList();
-
- AnnotationTagParser m_parser = new AnnotationTagParser(this);
-
- /**
- * Scope of the tag. TagSpec.TYPE | TagSpec.METHOD | TagSpec.FIELD. Not valid until
- * getAnnotationArea has been called for a completions request, and only then if
- * getAnnotationArea() did not return null.
- */
- int m_tagScope;
-
- public AnnotationTagCompletionProc() {
- initTagInfo();
- }
-
- private void initTagInfo() {
- if (m_tags == null)
- m_tags = AnnotationTagRegistry.getAllTagSpecs();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeContextInformation(org.eclipse.jdt.core.ICompilationUnit,
- * int)
- */
- public IContextInformation[] computeContextInformation(ICompilationUnit cu, int offset) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeCompletionProposals(org.eclipse.jdt.core.ICompilationUnit,
- * int, int, int)
- */
- public IJavaCompletionProposal[] computeCompletionProposals(ICompilationUnit cu, int offset, int length, int flags) {
- IEditorInput editorInput = new FileEditorInput((IFile) cu.getResource());
-
- // Set up completion processor state.
- m_doc = JavaUI.getDocumentProvider().getDocument(editorInput);
- m_icu = cu;
-
- try {
- AnnotationArea area = getAnnotationArea(offset);
-
- if (area == null) {
- return null;
- }
-
- // Check for tag completion first. ( the easier case )
- String tsf = getTagSoFarIfNotCompleted(area.beginOffset, offset);
-
- if (tsf != null) {
- return getTagCompletionsFor(tsf, area, length);
- }
-
- // Ach, have to try the harder case now, where we parse the
- // annotation
- return maybeCompleteAttribute(area, offset);
-
- } catch (JavaModelException e) {
- // Silently fail.
- return null;
- } catch (BadLocationException ex) {
- return null;
- }
- }
-
- private IJavaCompletionProposal[] maybeCompleteAttribute(AnnotationArea area, int cursorPos) throws BadLocationException {
- m_attSet.clear();
- m_attributes.clear();
-
- m_parser.setParserInput(m_doc.get(area.beginOffset, area.length()));
- m_parser.parse();
-
- TagSpec ts = getTagSpecForTagName(m_tagName.getText());
-
- // Do we even recognize this tag?
- if (ts == null) {
- return null;
- }
-
- // Loop through and determine whether the cursor is within a attribute
- // assignment, or between assignements.
- Attribute target = null;
- Attribute last = null;
- Attribute before = null;
- Attribute a = null;
- boolean between = false;
- int rCurPos = area.relativeCursorPos(cursorPos);
- Iterator i = m_attributes.iterator();
- while (i.hasNext()) {
- a = (Attribute) i.next();
-
- if (a.contains(rCurPos)) {
- target = a;
- break;
- } else if (last != null) {
- // See if the cursor is between, but not directly adjacent to
- // the last two attributes.
- if (rCurPos > last.maxExtent() + 1 && rCurPos < a.minExtent() - 1) {
- between = true;
- break;
- } else if (a.immediatelyPrecedes(rCurPos)) {
- before = a;
- break;
- }
- }
- last = a;
- }
-
- if (target == null) {
- if (between) {
- // If we're between attributes, suggest all possible attributes.
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- } else if (before != null) {
- // We're right after the attribute named in 'before', so set the
- // target to it, and fall
- // through to the target handling code.
- target = before;
- } else {
- // not between and not immediately after an attribute. We are
- // past the end of the parsed annotation.
- // Only offer suggestions if it looks like the last annotation
- // attribute is valid.
- if (a == null) {
- // No annotations attributes, suggest everything.
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- } else if (rCurPos > a.maxExtent()) {
- if (a.hasAssignment() && a.hasValue()) {
- // Last annotation was good, and we're past it, so do
- // completions for anything
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- } else if (a.hasAssignment())
- return attributeValidValuesFor(ts, a, area, cursorPos);
- else
- return attributeCompletionsFor(ts, cursorPos - a.name.length(), 0, a.name.getText(), true);
- } else {
- // Didn't match anything, not past the end - we're probably
- // the first attribute
- // being added to the tag.
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- }
- }
- }
-
- // Completion for a partial attribute name?
- if (target.name.immediatelyPrecedes(rCurPos)) {
- return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText(), !target.hasAssignment());
- }
-
- // Are we in the middle of a name?
- if (target.name.contains(rCurPos)) {
- // We've opted to replace the entire name for this case, which seems
- // to make the most sense.
- return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText().substring(0, rCurPos - target.name.getBeginning()), !target.hasAssignment());
- }
-
- // If we got this far, we're either in a value, or really confused.
- // try and return valid values or bail?
- if (a.value != null && (a.value.contains(rCurPos) || (target.hasAssignment() && area.relativeCursorPos(cursorPos) > a.name.getBeginning())))
- return attributeValidValuesFor(ts, a, area, cursorPos);
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- }
-
- /**
- * @return valid values for the attribute
- */
- private IJavaCompletionProposal[] attributeValidValuesFor(TagSpec ts, Attribute a, AnnotationArea area, int cursorPos) {
- TagAttribSpec tas = ts.attributeNamed(a.name.getText());
- if (tas == null)
- return null;
- String[] validValues = getValidValues(tas, a, area);
- String partialValue = calculatePartialValue(a, area, cursorPos);
- int valueOffset = calculateValueOffset(a, area, cursorPos);
- if (validValues == null || validValues.length == 0)
- return createCustomAttributeCompletionProposals(ts, tas, partialValue, valueOffset, a.value.getText(), area.javaElement);
- return createAttributeCompletionProposals(partialValue, valueOffset, validValues);
- }
-
- /**
- * @param ts
- * @param tas
- * @param partialValue
- * @param valueOffset
- * @param value
- * @param javaElement
- * @return
- */
- private IJavaCompletionProposal[] createCustomAttributeCompletionProposals(TagSpec ts, TagAttribSpec tas, String partialValue, int valueOffset, String value, IJavaElement javaElement) {
- AttributeValuesHelper helper = ts.getValidValuesHelper();
- if (helper == null)
- return null;
- AttributeValueProposalHelper[] proposalHelpers = helper.getAttributeValueProposalHelpers(tas, partialValue, valueOffset, javaElement);
- if (proposalHelpers == null || proposalHelpers.length == 0)
- return null;
- IJavaCompletionProposal[] proposals = new IJavaCompletionProposal[proposalHelpers.length];
- AnnotationTagProposal proposal;
- for (int i = 0; i < proposalHelpers.length; i++) {
- proposal = new AnnotationTagProposal(proposalHelpers[i]);
- //proposal.setPartialValueString(partialValue);
- proposals[i] = proposal;
- }
- return proposals;
- }
-
- private IJavaCompletionProposal[] createAttributeCompletionProposals(String partialValue, int valueOffset, String[] validValues) {
- List resultingValues = new ArrayList();
- for (int i = 0; i < validValues.length; i++) {
- String rplString = validValues[i];
- if (partialValue != null && !rplString.startsWith(partialValue))
- continue;
- AnnotationTagProposal prop = new AnnotationTagProposal(rplString, valueOffset, 0, null, rplString, 1);
- prop.setEnsureQuoted(true);
- //prop.setPartialValueString(partialValue);
- resultingValues.add(prop);
- }
- if (resultingValues.isEmpty())
- return null;
- return (IJavaCompletionProposal[]) resultingValues.toArray(new IJavaCompletionProposal[resultingValues.size()]);
- }
-
- private String[] getValidValues(TagAttribSpec tas, Attribute a, AnnotationArea area) {
- String[] validValues = tas.getValidValues();
- if (validValues == null || validValues.length == 0) {
- AttributeValuesHelper helper = tas.getTagSpec().getValidValuesHelper();
- if (helper == null)
- return null;
- validValues = helper.getValidValues(tas, area.javaElement);
- if ((validValues == null || validValues.length == 0) && tas.valueIsBool())
- validValues = BOOLEAN_VALID_VALUES;
- }
- return validValues;
- }
-
- /**
- * @param a
- * @param area
- * @param cursorPos
- * @return
- */
- private int calculateValueOffset(Attribute a, AnnotationArea area, int cursorPos) {
- if (a.value == null)
- return cursorPos;
- int nameEnd = a.name.getEnd();
- int valBeg = a.value.getBeginning();
- if (valBeg > nameEnd + 2)
- return area.relativeToAbs(nameEnd + 2); //Value too far away to be correct.
- return area.relativeToAbs(valBeg);
- }
-
- /**
- * @param a
- * @param area
- * @param cursorPos
- * @return
- */
- private String calculatePartialValue(Attribute a, AnnotationArea area, int cursorPos) {
- if (a.value == null)
- return null;
- int nameEnd = a.name.getEnd();
- int valueBeg = a.value.getBeginning();
- if (valueBeg > nameEnd + 2)
- return null; //Value is too far away so it must not be part of this attribute.
- int relativePos = area.relativeCursorPos(cursorPos);
- if (a.value.contains(relativePos)) {
- boolean hasBeginQuote = valueBeg - nameEnd == 2;
- String value = a.value.getText();
- int end = relativePos - valueBeg;
- if (hasBeginQuote)
- end--;
- if (end > -1) {
- int length = value.length();
- if (end < length)
- return value.substring(0, end);
- else if (end == length)
- return value;
- }
- }
- return null;
- }
-
- /**
- * @param tagName
- * @return
- */
- private TagSpec getTagSpecForTagName(String tagName) {
- String simpleName = tagName;
- if (tagName != null && tagName.length() > 0 && tagName.charAt(0) == '@')
- simpleName = tagName.length() == 2 ? "" : tagName.substring(1); //$NON-NLS-1$
- switch (m_tagScope) {
- case TagSpec.TYPE :
- return AnnotationTagRegistry.getTypeTag(simpleName);
- case TagSpec.METHOD :
- return AnnotationTagRegistry.getMethodTag(simpleName);
- case TagSpec.FIELD :
- return AnnotationTagRegistry.getFieldTag(simpleName);
- }
- return null;
- }
-
- private IJavaCompletionProposal[] attributeCompletionsFor(TagSpec ts, int replaceOffset, int replaceLength, String partialAttributeName, boolean appendEquals) {
- Iterator i = ts.getAttributes().iterator();
- List props = new ArrayList();
- while (i.hasNext()) {
- TagAttribSpec tas = (TagAttribSpec) i.next();
- String aname = tas.getAttribName();
-
- // Don't suggest attributes that have already been specified.
- if (!m_attSet.contains(aname)) {
- if (aname.startsWith(partialAttributeName)) {
- String rtxt = appendEquals ? aname + '=' : aname;
- AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, replaceOffset, replaceLength, null, aname, 1);
- prop.setHelpText(lookupAttHelp(tas));
- props.add(prop);
- }
- }
- }
- if (props.isEmpty()) {
- return null;
- }
- return (IJavaCompletionProposal[]) props.toArray(new IJavaCompletionProposal[props.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.annotations.TagParseEventHandler#annotationTag(com.ibm.ws.rd.annotations.Token)
- */
- public void annotationTag(Token tag) {
- m_tagName = tag;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.annotations.TagParseEventHandler#endOfTag(int)
- */
- public void endOfTag(int pos) {
- // Do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.annotations.TagParseEventHandler#attribute(com.ibm.ws.rd.annotations.Token,
- * int, com.ibm.ws.rd.annotations.Token)
- */
- public void attribute(Token name, int equalsPosition, Token value) {
- m_attributes.add(new Attribute(name, equalsPosition, value));
- m_attSet.add(name.getText());
- }
-
- private String getReplacementForTag(TagSpec ts, int beginIndex) {
- StringBuffer bud = new StringBuffer(32);
-
- bud.append('@');
- bud.append(ts.getTagName());
-
- String prefix = getArrayPrefixForMultipleAttribs(beginIndex);
- List attributes = ts.getAttributes();
-
- for (int i = 0; i < attributes.size(); i++) {
- TagAttribSpec tas = (TagAttribSpec) attributes.get(i);
-
- if (tas.isRequired()) {
- bud.append(prefix);
- bud.append(tas.getAttribName());
- bud.append('=');
- }
- }
- return bud.toString();
- }
-
- private String getArrayPrefixForMultipleAttribs(int beginIndex) {
- String result = null;
- String source = null;
- // Get source from compilation unit
- try {
- source = m_icu.getSource();
- if (source == null || beginIndex < 0)
- return result;
- // trim off everything after our begin index
- source = source.substring(0, beginIndex + 1);
- int newLineIndex = source.lastIndexOf('\n');
- //if we are on first line...
- if (newLineIndex == -1)
- newLineIndex = 0;
- // Get the current line
- String currentLine = source.substring(newLineIndex, beginIndex + 1);
- // Currently we have to have the '@' sign to show our menu
- int annotationIndex = currentLine.lastIndexOf('@');
- result = currentLine.substring(0, annotationIndex);
- result = result + " "; //$NON-NLS-1$
- } catch (Exception e) {
- // Do nothing
- }
-
- return result;
- }
-
- private IJavaCompletionProposal[] getTagCompletionsFor(String partialTagName, AnnotationArea area, int selectLength) {
- List found = new ArrayList();
-
- for (int i = 0; i < m_tags.size(); i++) {
- TagSpec ts = (TagSpec) m_tags.get(i);
- String tname = ts.getTagName();
-
- if (ts.getScope() == m_tagScope && tname.startsWith(partialTagName)) {
- String rtxt = getReplacementForTag(ts, area.beginOffset);
- String labl = '@' + tname;
- AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, area.beginOffset, Math.max(selectLength, rtxt.length()), null, labl, 1);
- prop.setHelpText(lookupTagHelp(ts));
- found.add(prop);
- }
- }
-
- if (!found.isEmpty()) {
- return (IJavaCompletionProposal[]) found.toArray(new IJavaCompletionProposal[found.size()]);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#getErrorMessage()
- */
- public String getErrorMessage() {
- // TODO Auto-generated method stub
- return null;
- }
-
- private static boolean isWS1(char c) {
- return c == ' ' || c == '\t' || c == '*' || c == '\r' || c == '\n';
- }
-
- private String getTagSoFarIfNotCompleted(int startingAt, int cursorAt) throws BadLocationException {
- if (m_doc.getChar(startingAt) != '@') {
- return null;
- }
-
- int firstChar = startingAt + 1;
-
- if (firstChar == cursorAt) {
- return ""; //$NON-NLS-1$
- }
-
- for (int i = firstChar; i < cursorAt; i++) {
- char c = m_doc.getChar(i);
-
- if (isWS1(c)) {
- return null;
- }
- }
-
- return m_doc.get(firstChar, cursorAt - firstChar);
- }
-
- /**
- * Calculates the the area of the annotation we're trying to complete. Also initializes
- * m_tagScope.
- *
- * @param fromOffset
- * @return
- * @throws JavaModelException
- */
- private AnnotationArea getAnnotationArea(int fromOffset) throws JavaModelException {
- // First, roughly calculate the end of the comment.
- IJavaElement el = m_icu.getElementAt(fromOffset);
- int absmax, absmin;
- if (el == null)
- return null;
- int ty = el.getElementType();
-
- switch (ty) {
- case IJavaElement.FIELD :
- IField f = (IField) el;
- absmax = f.getNameRange().getOffset();
- absmin = f.getSourceRange().getOffset();
- m_tagScope = TagSpec.FIELD;
- break;
-
- case IJavaElement.TYPE :
- IType t = (IType) el;
- absmax = t.getNameRange().getOffset();
- absmin = t.getSourceRange().getOffset();
- m_tagScope = TagSpec.TYPE;
- break;
-
- case IJavaElement.METHOD :
- IMethod m = (IMethod) el;
- absmax = m.getNameRange().getOffset();
- absmin = m.getSourceRange().getOffset();
- m_tagScope = TagSpec.METHOD;
- break;
-
- default :
- m_tagScope = -1;
- return null;
- }
-
- // Make sure we're not after the name for the member.
- if (absmax < fromOffset) {
- return null;
- }
-
- int min = 0, max = 0;
- try {
- // Search backwards for the starting '@'.
- boolean found = false;
- for (min = fromOffset; min >= absmin; min--) {
- if (m_doc.getChar(min) == '@') {
- found = true;
- break;
- }
- }
- if (!found) {
- return null;
- }
-
- // Search forwards for the next '@', or the end of the comment.
- for (max = fromOffset + 1; max < absmax; max++) {
- if (m_doc.getChar(max) == '@') {
- break;
- }
- }
- } catch (BadLocationException e) {
- return null;
- }
-
- return new AnnotationArea(el, min, Math.min(absmax, max));
- }
-
- private String lookupTagHelp(TagSpec ts) {
- if (ts != null)
- try {
- return ts.lookupTagHelp();
- } catch (MissingResourceException e) {
- // Do nothing, return null
- }
- return null;
- }
-
- private String lookupAttHelp(TagAttribSpec tas) {
- if (tas != null)
- try {
- return tas.lookupTagHelp();
- } catch (MissingResourceException e) {
- // Do nothing, return null
- }
- return null;
- }
-
- /**
- * A range that goes from the beginning position up to, but not including, the end position.
- */
- private static class AnnotationArea {
- /**
- * Document offset of the beginning of the javadoc annotation.
- */
- int beginOffset;
-
- /**
- * Document offset of the end of the area that could contain an annotation.
- */
- int endOffset;
- /**
- * The Java element that this annotation is assigned.
- *
- * @param beg
- * @param end
- */
- IJavaElement javaElement;
-
- public AnnotationArea(IJavaElement javaElement, int beg, int end) {
- this.javaElement = javaElement;
- beginOffset = beg;
- endOffset = end;
- }
-
- public boolean contains(int offset) {
- return offset >= beginOffset && offset < endOffset;
- }
-
- public int length() {
- return endOffset - beginOffset;
- }
-
- /**
- * Returns the cursor position relative to the area. Only valid if
- * <code>this.contains( absCursorPos )</code>
- *
- * @param absCursorPos
- * @return
- */
- public int relativeCursorPos(int absCursorPos) {
- return absCursorPos - beginOffset;
- }
-
- public int relativeToAbs(int relPos) {
- return beginOffset + relPos;
- }
- }
-
- private static class Attribute {
- Token name;
-
- Token value;
-
- int equalsPos;
-
- Attribute(Token n, int ep, Token v) {
- name = n;
- value = v;
- equalsPos = ep;
- }
-
- public boolean hasAssignment() {
- return equalsPos != -1;
- }
-
- public boolean hasValue() {
- return value.length() != 0;
- }
-
- public boolean contains(int srcPos) {
- return srcPos >= minExtent() && srcPos <= maxExtent();
- }
-
- public int minExtent() {
- return name.getBeginning();
- }
-
- public int maxExtent() {
- if (hasAssignment()) {
- if (hasValue())
- return value.getEnd();
- return equalsPos;
- }
- return name.getEnd();
- }
-
- public boolean immediatelyPrecedes(int pos) {
- return maxExtent() + 1 == pos;
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
deleted file mode 100644
index 0ea5773..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
+++ /dev/null
@@ -1,158 +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
- *******************************************************************************/
-/*
- * Created on Sep 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author kelleyp
- *
- * A completion proposal especially for Annotation tag completions. This problem this class was
- * created to solve was the problem of attaching help text to a proposal. The mechanism inside of
- * JavaCompletionProposal was useless to us, since it was tied to the idea that the proposal would
- * be for an actual java element, that has javadoc attached to it, etc... So here we subclass
- * JavaCompletionProposal and override <code>getAdditionalProposalInfo</code> for a more suitable
- * way of associating help text with a proposal.
- */
-public class AnnotationTagProposal extends JavaCompletionProposal {
- private static final char QUOTE = '"';
- private boolean ensureBeginQuote = false;
- private boolean ensureEndQuote = false;
- private String localString;
- //private String partialValueString;
- //private AttributeValueProposalHelper helper;
-
- /**
- * Localized help text.
- */
- private String locText;
-
- /**
- * @see JavaCompletionProposal#JavaCompletionProposal(java.lang.String, int, int,
- * org.eclipse.swt.graphics.Image, java.lang.String, int)
- * @param replacementString
- * @param replacementOffset
- * @param replacementLength
- * @param image
- * @param displayString
- * @param relevance
- */
- public AnnotationTagProposal(String replacementString, int replacementOffset, int replacementLength, Image image, String displayString, int relevance) {
- super(replacementString, replacementOffset, replacementLength, image, displayString, relevance);
- this.localString = displayString;
- }
-
- /**
- * @see JavaCompletionProposal#JavaCompletionProposal(java.lang.String, int, int,
- * org.eclipse.swt.graphics.Image, java.lang.String, int,
- * org.eclipse.jface.text.ITextViewer)
- * @param replacementString
- * @param replacementOffset
- * @param replacementLength
- * @param image
- * @param displayString
- * @param relevance
- */
-
- public AnnotationTagProposal(AttributeValueProposalHelper proposalHelper) {
- this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), null, proposalHelper.getValueDisplayString(), 1);
- if (proposalHelper instanceof UIAttributeValueProposalHelper)
- setImage(((UIAttributeValueProposalHelper) proposalHelper).getImage());
- setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
- setEnsureEndQuote(proposalHelper.ensureEndQuote());
- }
-
- public AnnotationTagProposal(UIAttributeValueProposalHelper proposalHelper) {
- this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), proposalHelper.getImage(), proposalHelper.getValueDisplayString(), 1);
- setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
- setEnsureEndQuote(proposalHelper.ensureEndQuote());
- }
-
- /**
- * Our override that uses <code>textHolder</code> to provide the help text.
- */
- public String getAdditionalProposalInfo() {
- return locText;
- }
-
- /**
- * Sets the holder of the help text that can be displayed with this proposal.
- *
- * @param hld
- * an LocalizedTextContainer
- */
- public void setHelpText(String s) {
- locText = s;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal#apply(org.eclipse.jface.text.IDocument,
- * char, int)
- */
- public void apply(IDocument document, char trigger, int offset) {
- ensureQuotedIfNecessary(document, offset);
- super.apply(document, trigger, offset);
- }
-
- /**
- * @param document
- * @param offset
- */
- private void ensureQuotedIfNecessary(IDocument document, int offset) {
- if (ensureBeginQuote || ensureEndQuote) {
- try {
- char begin = document.getChar(getReplacementOffset() - 1);
- char end = document.getChar(offset);
- if (ensureBeginQuote && ensureEndQuote && begin != QUOTE && end != QUOTE) {
- StringBuffer b = new StringBuffer();
- b.append(QUOTE).append(localString).append(QUOTE);
- localString = b.toString();
- } else if (ensureBeginQuote && begin != QUOTE)
- localString = QUOTE + localString;
- else if (ensureEndQuote && end != QUOTE)
- localString = localString + QUOTE;
- setReplacementString(localString);
- setCursorPosition(localString.length());
- } catch (BadLocationException e) {
- // Do nothing
- }
- }
- }
-
- public void setEnsureQuoted(boolean ensureQuoted) {
- setEnsureBeginQuote(ensureQuoted);
- setEnsureEndQuote(ensureQuoted);
- }
-
- //public void setPartialValueString(String partialValueString) {
- // this.partialValueString = partialValueString;
- //}
- public void setEnsureBeginQuote(boolean ensureBeginQuote) {
- this.ensureBeginQuote = ensureBeginQuote;
- }
-
- public void setEnsureEndQuote(boolean ensureEndQuote) {
- this.ensureEndQuote = ensureEndQuote;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
deleted file mode 100644
index 6ef86fa..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
+++ /dev/null
@@ -1,29 +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.jst.common.internal.annotations.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class IWRDResources extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.common.internal.annotations.ui.taghandlerui";//$NON-NLS-1$
-
- private IWRDResources() {
- // Do not instantiate
- }
-
- public static String J2EEAnnotationsCompletionProcessor_3;
- public static String J2EEAnnotationsCompletionProcessor_4;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, IWRDResources.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
deleted file mode 100644
index d595384..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
+++ /dev/null
@@ -1,41 +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.jst.common.internal.annotations.ui;
-
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author DABERG
- *
- */
-public class UIAttributeValueProposalHelper extends AttributeValueProposalHelper {
- private Image image;
-
- /**
- * @param replacementString
- * @param valueOffset
- * @param replacementLength
- * @param valueDisplayString
- */
- public UIAttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
- super(replacementString, valueOffset, replacementLength, valueDisplayString);
- }
-
- public Image getImage() {
- return image;
- }
-
- public void setImage(Image image) {
- this.image = image;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java
deleted file mode 100644
index 6e96f4c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java
+++ /dev/null
@@ -1,65 +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.jst.common.internal.annotations.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UiPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static UiPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public UiPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.internal.annotations.ui.UiPluginResources"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static UiPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = UiPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/.classpath b/plugins/org.eclipse.jst.common.frameworks/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.frameworks/.cvsignore b/plugins/org.eclipse.jst.common.frameworks/.cvsignore
deleted file mode 100644
index e621eda..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-jdt_integration.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.common.frameworks/.project b/plugins/org.eclipse.jst.common.frameworks/.project
deleted file mode 100644
index 22c0bcb..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.frameworks</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
deleted file mode 100644
index 11f6ca9..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Integration Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.frameworks; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package:
- org.eclipse.jst.common.jdt.internal.classpath,
- org.eclipse.jst.common.jdt.internal.integration,
- org.eclipse.jst.common.project.facet
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.util,
- org.eclipse.core.resources,
- org.eclipse.wst.common.emf,
- org.eclipse.core.commands,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.validation,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.jem.workbench
diff --git a/plugins/org.eclipse.jst.common.frameworks/about.html b/plugins/org.eclipse.jst.common.frameworks/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/build.properties b/plugins/org.eclipse.jst.common.frameworks/build.properties
deleted file mode 100644
index f1ba0db..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/build.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- about.html,\
- images/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.common.frameworks/component.xml b/plugins/org.eclipse.jst.common.frameworks/component.xml
deleted file mode 100644
index 4a89647..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/component.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
- name="org.eclipse.jst.common.frameworks">
- <component-depends unrestricted="true"></component-depends>
- <plugin id="org.eclipse.jst.common.frameworks" fragment="false" />
- <plugin id="org.eclipse.jst.common.navigator.java" fragment="false" />
- <plugin id="org.eclipse.jst.common.annotations.controller"
- fragment="false" />
- <plugin id="org.eclipse.jst.common.annotations.core"
- fragment="false" />
- <plugin id="org.eclipse.jst.common.annotations.ui" fragment="false" />
-</component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/images/java.gif b/plugins/org.eclipse.jst.common.frameworks/images/java.gif
deleted file mode 100644
index 37cb4e7..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/images/java.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.common.frameworks/plugin.xml b/plugins/org.eclipse.jst.common.frameworks/plugin.xml
deleted file mode 100644
index 0c95ce1..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/plugin.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- id="context.Sensitive.Class.workingCopyManager"
- name="Working Copy Manager - Headless Context Class"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="workingCopyManager"
- context="Headless"
- className="org.eclipse.jst.common.jdt.internal.integration.WTPWorkingCopyManager">
- </uiContextSensitiveClass>
- </extension>
-
- <extension
- id="javaProjectValidationHandler"
- name="javaProjectValidationHandler"
- point="org.eclipse.wst.validation.validationSelectionHandler">
- <validationSelectionHandler
- id="javaProjectValidationHandler"
- handlerClass="org.eclipse.jst.common.jdt.internal.integration.JavaProjectValidationHandler"
- selectionType="org.eclipse.jdt.core.IJavaProject"/>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.utility"
- factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
- </editModel>
- </extension>
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.java">
- <label>Java</label>
- <description>Adds support for writing applications using Java programming language.</description>
- <icon>images/java.gif</icon>
- </project-facet>
-
- <project-facet-version facet="jst.java" version="1.3">
- <action type="install">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider"/>
- </action>
- <action type="version-change">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetVersionChangeDelegate"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <conflicts group="java"/>
- </constraint>
- <group-member id="java"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.java" version="1.4">
- <action type="install">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider"/>
- </action>
- <action type="version-change">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetVersionChangeDelegate"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <conflicts group="java"/>
- </constraint>
- <group-member id="java"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.java" version="5.0">
- <action type="install">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider"/>
- </action>
- <action type="version-change">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetVersionChangeDelegate"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.common.project.facet.JavaFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <conflicts group="java"/>
- </constraint>
- <group-member id="java"/>
- </project-facet-version>
-
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.validators">
- <validator class="org.eclipse.jst.common.project.facet.JavaFacetValidator">
- <facet id="jst.java"/>
- </validator>
- </extension>
-
- <extension
- point="org.eclipse.core.resources.markers"
- id="javaVersionMismatch">
- <super type="org.eclipse.wst.common.project.facet.core.validation.marker"/>
- <attribute name="facetVersion"/>
- <attribute name="compilerLevel"/>
- <persistent value="true"/>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/frameworks/CommonFrameworksPlugin.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/frameworks/CommonFrameworksPlugin.java
deleted file mode 100644
index f28eeb8..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/frameworks/CommonFrameworksPlugin.java
+++ /dev/null
@@ -1,51 +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.jst.common.frameworks;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-
-public final class CommonFrameworksPlugin
-
- extends WTPPlugin
-
-{
- public static final String PLUGIN_ID = "org.eclipse.jst.common.frameworks"; //$NON-NLS-1$
-
- private static final CommonFrameworksPlugin inst
- = new CommonFrameworksPlugin();
-
- /**
- * Get the plugin singleton.
- */
-
- public static CommonFrameworksPlugin getDefault()
- {
- return inst;
- }
-
- public String getPluginID()
- {
- return PLUGIN_ID;
- }
-
- public static void log( final Exception e )
- {
- final ILog log = CommonFrameworksPlugin.getDefault().getLog();
- final String msg = "Encountered an unexpected exception."; //$NON-NLS-1$
-
- log.log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorations.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorations.java
deleted file mode 100644
index b120ec8..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorations.java
+++ /dev/null
@@ -1,75 +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.jst.common.jdt.internal.classpath;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class ClasspathDecorations
-{
- private IPath sourceAttachmentPath;
- private IPath sourceAttachmentRootPath;
- private ArrayList extraAttributes = new ArrayList();
-
- public IPath getSourceAttachmentPath()
- {
- return this.sourceAttachmentPath;
- }
-
- void setSourceAttachmentPath( final IPath sourceAttachmentPath )
- {
- this.sourceAttachmentPath = sourceAttachmentPath;
- }
-
- public IPath getSourceAttachmentRootPath()
- {
- return this.sourceAttachmentRootPath;
- }
-
- void setSourceAttachmentRootPath( final IPath sourceAttachmentRootPath )
- {
- this.sourceAttachmentRootPath = sourceAttachmentRootPath;
- }
-
- public IClasspathAttribute[] getExtraAttributes()
- {
- final IClasspathAttribute[] array
- = new IClasspathAttribute[ this.extraAttributes.size() ];
-
- return (IClasspathAttribute[]) this.extraAttributes.toArray( array );
- }
-
- void setExtraAttributes( final IClasspathAttribute[] attrs )
- {
- for( int i = 0; i < attrs.length; i++ )
- {
- this.extraAttributes.add( attrs[ i ] );
- }
- }
-
- void addExtraAttribute( final String name,
- final String value )
- {
- final IClasspathAttribute attr
- = JavaCore.newClasspathAttribute( name, value );
-
- this.extraAttributes.add( attr );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorationsManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorationsManager.java
deleted file mode 100644
index fe7e885..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorationsManager.java
+++ /dev/null
@@ -1,371 +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.jst.common.jdt.internal.classpath;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class ClasspathDecorationsManager
-{
- private final File f;
- private final HashMap decorations;
-
- public ClasspathDecorationsManager( final String plugin )
- {
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final File wsdir = ws.getRoot().getLocation().toFile();
- final File wsmdroot = new File( wsdir, ".metadata/.plugins" ); //$NON-NLS-1$
- final File pmdroot = new File( wsmdroot, plugin );
-
- this.f = new File( pmdroot, "classpath.decorations.xml" ); //$NON-NLS-1$
- this.decorations = read();
- }
-
- public ClasspathDecorations getDecorations( final String container,
- final String entry )
- {
- final HashMap submap = (HashMap) this.decorations.get( container );
-
- if( submap == null )
- {
- return null;
- }
-
- return (ClasspathDecorations) submap.get( entry );
- }
-
- public void setDecorations( final String container,
- final String entry,
- final ClasspathDecorations dec )
- {
- HashMap submap = (HashMap) this.decorations.get( container );
-
- if( submap == null )
- {
- submap = new HashMap();
- this.decorations.put( container, submap );
- }
-
- submap.put( entry, dec );
- }
-
- public void clearAllDecorations( final String container )
- {
- this.decorations.remove( container );
- }
-
- public void save()
- {
- final File folder = this.f.getParentFile();
-
- if( ! folder.exists() && ! folder.mkdirs() )
- {
- return;
- }
-
- PrintWriter w = null;
-
- try
- {
- w = new PrintWriter( new BufferedWriter( new FileWriter( this.f ) ) );
-
- w.println( "<classpath>" ); //$NON-NLS-1$
-
- for( Iterator itr1 = decorations.entrySet().iterator();
- itr1.hasNext(); )
- {
- final Map.Entry entry1 = (Map.Entry) itr1.next();
- final Map submap = (Map) entry1.getValue();
-
- w.print( " <container id=\"" ); //$NON-NLS-1$
- w.print( (String) entry1.getKey() );
- w.println( "\">" ); //$NON-NLS-1$
-
- for( Iterator itr2 = submap.entrySet().iterator();
- itr2.hasNext(); )
- {
- final Map.Entry entry2 = (Map.Entry) itr2.next();
-
- final ClasspathDecorations dec
- = (ClasspathDecorations) entry2.getValue();
-
- w.print( " <entry id=\"" ); //$NON-NLS-1$
- w.print( (String) entry2.getKey() );
- w.println( "\">" ); //$NON-NLS-1$
-
- if( dec.getSourceAttachmentPath() != null )
- {
- w.print( " <source-attachment-path>" ); //$NON-NLS-1$
- w.print( dec.getSourceAttachmentPath().toString() );
- w.println( "</source-attachment-path>" ); //$NON-NLS-1$
- }
-
- if( dec.getSourceAttachmentRootPath() != null )
- {
- w.print( " <source-attachment-root-path>" ); //$NON-NLS-1$
- w.print( dec.getSourceAttachmentRootPath().toString() );
- w.println( "</source-attachment-root-path>" ); //$NON-NLS-1$
- }
-
- final IClasspathAttribute[] attrs
- = dec.getExtraAttributes();
-
- for( int i = 0; i < attrs.length; i++ )
- {
- final IClasspathAttribute attr = attrs[ i ];
-
- w.print( " <attribute name=\"" ); //$NON-NLS-1$
- w.print( attr.getName() );
- w.print( "\">" ); //$NON-NLS-1$
- w.print( attr.getValue() );
- w.println( "</attribute>" ); //$NON-NLS-1$
- }
-
- w.println( " </entry>" ); //$NON-NLS-1$
- }
-
- w.println( " </container>" ); //$NON-NLS-1$
- }
-
- w.println( "</classpath>" ); //$NON-NLS-1$
- }
- catch( IOException e )
- {
- CommonFrameworksPlugin.log( e );
- }
- finally
- {
- w.close();
- }
- }
-
- private HashMap read()
- {
- final HashMap map = new HashMap();
- if( ! this.f.exists() ) return map;
-
- InputStream in = null;
- Element root = null;
-
- try
- {
- final DocumentBuilderFactory factory
- = DocumentBuilderFactory.newInstance();
-
- final DocumentBuilder docbuilder = factory.newDocumentBuilder();
-
- in = new BufferedInputStream( new FileInputStream( f ) );
- root = docbuilder.parse( in ).getDocumentElement();
- }
- catch( Exception e )
- {
- CommonFrameworksPlugin.log( e );
- return map;
- }
- finally
- {
- if( in != null )
- {
- try
- {
- in.close();
- }
- catch( IOException e ) {}
- }
- }
-
- for( Iterator itr1 = elements( root, "container" ); itr1.hasNext(); ) //$NON-NLS-1$
- {
- final Element e1 = (Element) itr1.next();
- final String cid = e1.getAttribute( "id" ); //$NON-NLS-1$
-
- final HashMap submap = new HashMap();
- map.put( cid, submap );
-
- for( Iterator itr2 = elements( e1, "entry" ); itr2.hasNext(); ) //$NON-NLS-1$
- {
- final Element e2 = (Element) itr2.next();
- final String eid = e2.getAttribute( "id" ); //$NON-NLS-1$
- final ClasspathDecorations dec = new ClasspathDecorations();
-
- submap.put( eid, dec );
-
- for( Iterator itr3 = elements( e2 ); itr3.hasNext(); )
- {
- final Element e3 = (Element) itr3.next();
- final String n = e3.getNodeName();
-
- if( n.equals( "source-attachment-path" ) ) //$NON-NLS-1$
- {
- dec.setSourceAttachmentPath( new Path( text( e3 ) ) );
- }
- else if( n.equals( "source-attachment-root-path" ) ) //$NON-NLS-1$
- {
- dec.setSourceAttachmentRootPath( new Path( text( e3 ) ) );
- }
- else if( n.equals( "attribute" ) ) //$NON-NLS-1$
- {
- final String name = e3.getAttribute( "name" ); //$NON-NLS-1$
- dec.addExtraAttribute( name, text( e3 ) );
- }
- }
- }
- }
-
- return map;
- }
-
- private static String text( final Element el )
- {
- final NodeList nodes = el.getChildNodes();
-
- String str = null;
- StringBuffer buf = null;
-
- for( int i = 0, n = nodes.getLength(); i < n; i++ )
- {
- final Node node = nodes.item( i );
-
- if( node.getNodeType() == Node.TEXT_NODE )
- {
- final String val = node.getNodeValue();
-
- if( buf != null )
- {
- buf.append( val );
- }
- else if( str != null )
- {
- buf = new StringBuffer();
- buf.append( str );
- buf.append( val );
-
- str = null;
- }
- else
- {
- str = val;
- }
- }
- }
-
- if( buf != null )
- {
- return buf.toString();
- }
- return str;
- }
-
- private static Iterator elements( final Element el,
- final String name )
- {
- return new ElementsIterator( el, name );
- }
-
- private static Iterator elements( final Element el )
- {
- return new ElementsIterator( el, null );
- }
-
- private static final class ElementsIterator
-
- implements Iterator
-
- {
- private final NodeList nodes;
- private final int length;
- private final String name;
- private int position;
- private Element element;
-
- public ElementsIterator( final Element parent,
- final String name )
- {
- this.nodes = parent.getChildNodes();
- this.length = nodes.getLength();
- this.position = -1;
- this.name = name;
-
- advance();
- }
-
- private void advance()
- {
- this.element = null;
- this.position++;
-
- for( ; this.position < this.length && this.element == null;
- this.position++ )
- {
- final Node node = this.nodes.item( this.position );
-
- if( node.getNodeType() == Node.ELEMENT_NODE &&
- ( this.name == null ||
- node.getNodeName().equals( this.name ) ) )
- {
- this.element = (Element) node;
- }
- }
- }
-
- public boolean hasNext()
- {
- return ( this.element != null );
- }
-
- public Object next()
- {
- final Element el = this.element;
-
- if( el == null )
- {
- throw new NoSuchElementException();
- }
-
- advance();
-
- return el;
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java
deleted file mode 100644
index e2d23fd..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java
+++ /dev/null
@@ -1,373 +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.jst.common.jdt.internal.classpath;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-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.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-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.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public abstract class FlexibleProjectContainer
-
- implements IClasspathContainer
-
-{
- protected static final class PathType
- {
- public static final PathType
- LIB_DIRECTORY = new PathType(),
- CLASSES_DIRECTORY = new PathType();
- }
-
- private static ClasspathDecorationsManager decorations;
-
- static
- {
- // Register the resource listener that will listen for changes to
- // resources relevant to flexible project containers across the
- // workspace and refresh them as necessary.
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
-
- ws.addResourceChangeListener( new Listener(),
- IResourceChangeEvent.POST_CHANGE );
-
- // Read the decorations from the workspace metadata.
-
- final String plugin = CommonFrameworksPlugin.PLUGIN_ID;
- decorations = new ClasspathDecorationsManager( plugin );
- }
-
- protected final IPath path;
- protected final IJavaProject owner;
- protected final IProject project;
- private final IClasspathEntry[] cpentries;
- private final IPath[] watchlist;
-
- /**
- * @deprecated
- */
-
- public FlexibleProjectContainer( final IPath path,
- final IJavaProject owner,
- final IProject project,
- final String component,
- final IPath[] paths,
- final PathType[] types )
- {
- this( path, owner, project, paths, types );
- }
-
- public FlexibleProjectContainer( final IPath path,
- final IJavaProject owner,
- final IProject project,
- final IPath[] paths,
- final PathType[] types )
- {
- this.path = path;
- this.owner = owner;
- this.project = project;
-
- final ArrayList cp = new ArrayList();
- final ArrayList w = new ArrayList();
-
- if( ! isFlexibleProject( this.project ) )
- {
- // Silently noop if the referenced project is not a flexible
- // project. Should I be doing something else here?
-
- this.cpentries = new IClasspathEntry[ 0 ];
- this.watchlist = new IPath[ 0 ];
-
- return;
- }
-
- final IVirtualComponent vc = ComponentCore.createComponent(this.project);
-
- for( int i = 0; i < paths.length; i++ )
- {
- final IVirtualFolder rootFolder = vc.getRootFolder();
- final IVirtualFolder vf = rootFolder.getFolder( paths[ i ] );
-
- if( types[ i ] == PathType.LIB_DIRECTORY )
- {
- final IVirtualResource[] contents;
-
- try
- {
- contents = vf.members();
- }
- catch( CoreException e )
- {
- CommonFrameworksPlugin.log( e );
- continue;
- }
-
- for( int j = 0; j < contents.length; j++ )
- {
- final IResource r = contents[ j ].getUnderlyingResource();
- final IPath p = r.getFullPath();
- final File f = r.getLocation().toFile();
- final String fname = f.getName().toLowerCase();
-
- if( f.isFile() && fname.endsWith( ".jar" ) ) //$NON-NLS-1$
- {
- cp.add( newLibraryEntry( p ) );
- }
- }
-
- final IContainer[] folders = vf.getUnderlyingFolders();
-
- for( int j = 0; j < folders.length; j++ )
- {
- w.add( folders[ j ].getFullPath() );
- }
- }
- else
- {
- final IContainer[] uf = vf.getUnderlyingFolders();
-
- for( int j = 0; j < uf.length; j++ )
- {
- final IPath p = uf[ j ].getFullPath();
-
- if( ! isSourceOrOutputDirectory( p ) )
- {
- cp.add( newLibraryEntry( p ) );
- }
- }
- }
- }
-
- w.add( this.project.getFullPath().append( IModuleConstants.COMPONENT_FILE_PATH ) );
- w.add( this.project.getFullPath().append( ".classpath" ) );
-
- this.cpentries = new IClasspathEntry[ cp.size() ];
- cp.toArray( this.cpentries );
-
- this.watchlist = new IPath[ w.size() ];
- w.toArray( this.watchlist );
- }
-
- public int getKind()
- {
- return K_APPLICATION;
- }
-
- public IPath getPath()
- {
- return this.path;
- }
-
- public IClasspathEntry[] getClasspathEntries()
- {
- return this.cpentries;
- }
-
- public boolean isOutOfDate( final IResourceDelta delta )
- {
- for( int i = 0; i < this.watchlist.length; i++ )
- {
- if(delta != null && delta.findMember( this.watchlist[ i ] ) != null )
- {
- return true;
- }
- }
-
- return false;
- }
-
- public abstract void refresh();
-
- static ClasspathDecorationsManager getDecorationsManager()
- {
- return decorations;
- }
-
- private IClasspathEntry newLibraryEntry( final IPath p )
- {
- IPath srcpath = null;
- IPath srcrootpath = null;
- IClasspathAttribute[] attrs = {};
- IAccessRule[] access = {};
-
- final ClasspathDecorations dec
- = decorations.getDecorations( getPath().toString(), p.toString() );
-
- if( dec != null )
- {
- srcpath = dec.getSourceAttachmentPath();
- srcrootpath = dec.getSourceAttachmentRootPath();
- attrs = dec.getExtraAttributes();
- }
-
- return JavaCore.newLibraryEntry( p, srcpath, srcrootpath, access, attrs,
- false );
-
- }
-
- private boolean isSourceOrOutputDirectory( final IPath aPath )
- {
- if( isJavaProject( this.project ) )
- {
- try
- {
- final IJavaProject jproject = JavaCore.create( this.project );
- final IClasspathEntry[] cp = jproject.getRawClasspath();
-
- for( int i = 0; i < cp.length; i++ )
- {
- final IClasspathEntry cpe = cp[ i ];
-
- if( cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE )
- {
- final IPath src = cpe.getPath();
- final IPath output = cpe.getOutputLocation();
-
- if( src.equals( aPath ) ||
- output != null && output.equals( aPath ) )
- {
- return true;
- }
- }
- }
-
- if( jproject.getOutputLocation().equals( aPath ) )
- {
- return true;
- }
- }
- catch( JavaModelException e )
- {
- CommonFrameworksPlugin.log( e );
- }
- }
-
- return false;
- }
-
- private static boolean isJavaProject( final IProject pj )
- {
- try
- {
- return pj.getNature( JavaCore.NATURE_ID ) != null;
- }
- catch( CoreException e )
- {
- return false;
- }
- }
-
- private static boolean isFlexibleProject( final IProject pj )
- {
- try
- {
- return pj.getNature( IModuleConstants.MODULE_NATURE_ID ) != null;
- }
- catch( CoreException e )
- {
- return false;
- }
- }
-
- private static class Listener
-
- implements IResourceChangeListener
-
- {
- public void resourceChanged( final IResourceChangeEvent event )
- {
- // Locate all of the flexible project containers.
-
- final ArrayList containers = new ArrayList();
-
- final IProject[] projects
- = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-
- for( int i = 0; i < projects.length; i++ )
- {
- final IProject project = projects[ i ];
-
- try
- {
- if( isJavaProject( project ) )
- {
- final IJavaProject jproj = JavaCore.create( project );
- final IClasspathEntry[] cpes = jproj.getRawClasspath();
-
- for( int j = 0; j < cpes.length; j++ )
- {
- final IClasspathEntry cpe = cpes[ j ];
-
- if( cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER )
- {
- final IClasspathContainer cont
- = JavaCore.getClasspathContainer( cpe.getPath(), jproj );
-
- if( cont instanceof FlexibleProjectContainer )
- {
- containers.add( cont );
- }
- }
- }
- }
- }
- catch( JavaModelException e )
- {
- CommonFrameworksPlugin.log( e );
- }
- }
-
- // Refresh the containers that are out of date.
-
- final IResourceDelta delta = event.getDelta();
-
- for( int i = 0, n = containers.size(); i < n; i++ )
- {
- final FlexibleProjectContainer c
- = (FlexibleProjectContainer) containers.get( i );
-
- if( c.isOutOfDate( delta ) )
- {
- c.refresh();
- }
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainerInitializer.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainerInitializer.java
deleted file mode 100644
index f3849aa..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainerInitializer.java
+++ /dev/null
@@ -1,82 +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.jst.common.jdt.internal.classpath;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public abstract class FlexibleProjectContainerInitializer
-
- extends ClasspathContainerInitializer
-
-{
- private static final ClasspathDecorationsManager decorations
- = FlexibleProjectContainer.getDecorationsManager();
-
- public boolean canUpdateClasspathContainer( final IPath containerPath,
- final IJavaProject project)
- {
- return true;
- }
-
- public void requestClasspathContainerUpdate( final IPath containerPath,
- final IJavaProject project,
- final IClasspathContainer sg )
-
- throws CoreException
-
- {
- final String cid = containerPath.toString();
- final IClasspathEntry[] entries = sg.getClasspathEntries();
-
- decorations.clearAllDecorations( cid );
-
- for( int i = 0; i < entries.length; i++ )
- {
- final IClasspathEntry entry = entries[ i ];
-
- final IPath srcpath = entry.getSourceAttachmentPath();
- final IPath srcrootpath = entry.getSourceAttachmentRootPath();
- final IClasspathAttribute[] attrs = entry.getExtraAttributes();
-
- if( srcpath != null || attrs.length > 0 )
- {
- final String eid = entry.getPath().toString();
- final ClasspathDecorations dec = new ClasspathDecorations();
-
- dec.setSourceAttachmentPath( srcpath );
- dec.setSourceAttachmentRootPath( srcrootpath );
- dec.setExtraAttributes( attrs );
-
- decorations.setDecorations( cid, eid, dec );
- }
- }
-
- decorations.save();
-
- final IClasspathContainer container
- = JavaCore.getClasspathContainer( containerPath, project );
-
- ( (FlexibleProjectContainer) container ).refresh();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/IJavaProjectCreationProperties.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/IJavaProjectCreationProperties.java
deleted file mode 100644
index 90a0d4b..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/IJavaProjectCreationProperties.java
+++ /dev/null
@@ -1,37 +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.jst.common.jdt.internal.integration;
-
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationProperties;
-
-public interface IJavaProjectCreationProperties extends IProjectCreationProperties {
-
- /**
- * Optional, type String []. These names are relative.
- */
- public static final String SOURCE_FOLDERS = "JavaProjectCreationDataModel.SOURCE_FOLDERS"; //$NON-NLS-1$
- /**
- * Optional, type Boolean default is True
- */
- public static final String CREATE_SOURCE_FOLDERS = "JavaProjectCreationDataModel.CREATE_SOURCE_FOLDERS"; //$NON-NLS-1$
-
-
- /**
- * Optional, type IClasspathEntry[]
- */
- public static final String CLASSPATH_ENTRIES = "JavaProjectCreationDataModel.CLASSPATH_ENTRIES"; //$NON-NLS-1$
-
- /**
- * Optional, type String
- */
- public static final String OUTPUT_LOCATION = "JavaProjectCreationDataModel.OUTPUT_LOCATION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModel.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModel.java
deleted file mode 100644
index 19e360d..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModel.java
+++ /dev/null
@@ -1,217 +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.jst.common.jdt.internal.integration;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class JavaArtifactEditModel extends ArtifactEditModel implements WorkingCopyProvider {
-
- private WorkingCopyManager workingCopyManager = null;
-
- /**
- * @param anEditModelId
- * @param aContext
- * @param toMakeReadOnly
- * @param toAccessUnknownResourcesAsReadOnly
- * @param aModuleURI
- */
- public JavaArtifactEditModel(String anEditModelId, EMFWorkbenchContext aContext, boolean toMakeReadOnly, boolean toAccessUnknownResourcesAsReadOnly, URI aModuleURI) {
- super(anEditModelId, aContext, toMakeReadOnly,
- toAccessUnknownResourcesAsReadOnly, aModuleURI);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param anEditModelId
- * @param aContext
- * @param toMakeReadOnly
- * @param aModuleURI
- */
- public JavaArtifactEditModel(String anEditModelId, EMFWorkbenchContext aContext, boolean toMakeReadOnly, URI aModuleURI) {
- super(anEditModelId, aContext, toMakeReadOnly, aModuleURI);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * This will delete
- *
- * @cu from the workbench and fix the internal references for this working copy manager.
- */
- public void delete(org.eclipse.jdt.core.ICompilationUnit cu, org.eclipse.core.runtime.IProgressMonitor monitor) {
- getWorkingCopyManager().delete(cu, monitor);
- }
-
- /**
- * This method should only be called by the J2EENature.
- */
- public void dispose() {
- super.dispose();
- resetWorkingCopyManager();
- }
-
- public Set getAffectedFiles() {
- java.util.Set affected = super.getAffectedFiles();
- if (getWorkingCopyManager() != null)
- affected.addAll(getWorkingCopyManager().getAffectedFiles());
-
- return affected;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input. Does not connect the edit model to the working copy.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(org.eclipse.jdt.core.ICompilationUnit cu) throws org.eclipse.core.runtime.CoreException {
- return getWorkingCopyManager().getExistingWorkingCopy(cu);
- }
-
- /**
- * Returns the working copy remembered for the compilation unit.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if there is no
- * remembered working copy for this compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws CoreException {
- return getWorkingCopyManager().getWorkingCopy(cu, forNewCU);
- }
-
- /**
- * Save the new compilation units only.
- */
- protected void handleSaveIfNecessaryDidNotSave(IProgressMonitor monitor) {
- getWorkingCopyManager().saveOnlyNewCompilationUnits(monitor);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.workbench.J2EEEditModel#isDirty()
- */
- public boolean isDirty() {
- boolean dirtyBool = super.isDirty();
- if (!dirtyBool && getWorkingCopyManager() != null)
- dirtyBool = getWorkingCopyManager().hasWorkingCopies();
- return dirtyBool;
- }
-
- /**
- * This will force all of the referenced Resources to be saved.
- */
- public void primSave(IProgressMonitor monitor) {
- saveCompilationUnits(monitor);
- if (monitor == null || !monitor.isCanceled())
- super.primSave(monitor);
- }
- protected void runSaveOperation(IWorkspaceRunnable runnable, IProgressMonitor monitor) throws SaveFailedException {
- try {
- ResourcesPlugin.getWorkspace().run(runnable, null,IWorkspace.AVOID_UPDATE,monitor);
- } catch (CoreException e) {
- throw new SaveFailedException(e);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (4/11/2001 4:14:26 PM)
- *
- * @return java.util.Set
- */
- public void processResource(Resource aResource) {
- if (aResource != null && !getResources().contains(aResource)) {
- if (aResource instanceof ReferencedResource) {
- access((ReferencedResource) aResource);
- //We need a better way to pass this through the save options instead.
- //We also need to make this dynamic based on the project target
- ((ReferencedResource) aResource).setFormat(CompatibilityXMIResource.FORMAT_MOF5);
- } else if (!isReadOnly())
- aResource.setTrackingModification(true);
- addResource(aResource);
- }
- }
-
- /**
- * Release each of the referenced resources.
- */
- protected void release(Resource aResource) {
-
- removeResource(aResource);
- if (aResource != null) {
- boolean isRefRes = aResource instanceof ReferencedResource;
- if (isRefRes)
- release((ReferencedResource) aResource);
- if (!isDisposing())
- resetWorkingCopyManager();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.workbench.J2EEEditModel#resourceIsLoadedChanged(org.eclipse.emf.ecore.resource.Resource,
- * boolean, boolean)
- */
- protected void resourceIsLoadedChanged(Resource aResource, boolean oldValue, boolean newValue) {
- if (!isReverting && !disposing && !isReadOnly() && oldValue && !newValue && aResource instanceof TranslatorResource)
- resetWorkingCopyManager();
- super.resourceIsLoadedChanged(aResource, oldValue, newValue);
- }
-
- protected void reverted(ReferencedResource revertedResource) {
- if (getWorkingCopyManager() != null)
- getWorkingCopyManager().revert();
- revertAllResources();
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- public void saveCompilationUnits(IProgressMonitor monitor) {
- getWorkingCopyManager().saveCompilationUnits(monitor);
- }
-
- public WorkingCopyManager getWorkingCopyManager() {
- if (workingCopyManager == null)
- workingCopyManager = WorkingCopyManagerFactory.newRegisteredInstance();
- return workingCopyManager;
- }
-
- /**
- * Reset the working copy manager because the ejb-jar.xml was removed without disposing.
- */
- protected void resetWorkingCopyManager() {
- if (workingCopyManager != null) {
- workingCopyManager.dispose();
- workingCopyManager = null;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModelFactory.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModelFactory.java
deleted file mode 100644
index 892b2ab..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModelFactory.java
+++ /dev/null
@@ -1,63 +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.jst.common.jdt.internal.integration;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class JavaArtifactEditModelFactory extends EditModelFactory {
-
- public static final String MODULE_EDIT_MODEL_ID = "org.eclipse.jst.modulecore.editModel"; //$NON-NLS-1$
-
- public static final String PARAM_MODULE_URI = "MODULE_URI"; //$NON-NLS-1$
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory#createEditModelForRead(java.lang.String, org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext, java.util.Map)
- */
- public EditModel createEditModelForRead(String editModelID, EMFWorkbenchContext context, Map params) {
- URI moduleURI = (URI) ((params != null) ? params.get(PARAM_MODULE_URI) : null);
- if(moduleURI == null)
- throw new IllegalStateException("A Module URI must be provided"); //$NON-NLS-1$
-
- return new JavaArtifactEditModel(editModelID, context, true, moduleURI);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory#createEditModelForWrite(java.lang.String, org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext, java.util.Map)
- */
- public EditModel createEditModelForWrite(String editModelID, EMFWorkbenchContext context, Map params) {
- URI moduleURI = (URI) ((params != null) ? params.get(PARAM_MODULE_URI) : null);
- if(moduleURI == null)
- throw new IllegalStateException("A Module URI must be provided"); //$NON-NLS-1$
- return new JavaArtifactEditModel(editModelID, context, false,false, moduleURI);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory#getCacheID(java.lang.String, java.util.Map)
- */
- public String getCacheID(String editModelID, Map params) {
- URI moduleURI = (URI)params.get(PARAM_MODULE_URI);
- if(moduleURI != null)
- return editModelID+":"+moduleURI.toString(); //$NON-NLS-1$
- return editModelID+":NOURI"; //$NON-NLS-1$
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java
deleted file mode 100644
index abab902..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java
+++ /dev/null
@@ -1,176 +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.jst.common.jdt.internal.integration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.jdom.DOMFactory;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-
-/**
- * @author DABERG
- *
- * This class is used by the Java snippet support to capture the insertionString that is to be
- * inserted at the users selection point. It also provides the ability to define additional fields
- * and methods to support the insertionString.
- */
-public class JavaInsertionHelper {
- protected DOMFactory domFactory = new DOMFactory();
- protected List fields;
- protected List methods;
- protected List imports;
- protected String insertionString;
- protected List extendedOperations;
-
- /**
- *
- */
- public JavaInsertionHelper() {
- super();
- }
-
- /**
- * @return
- */
- public List getFields() {
- return fields;
- }
-
- /**
- * @return
- */
- public String getInsertionString() {
- return insertionString;
- }
-
- /**
- * @return
- */
- public List getMethods() {
- return methods;
- }
-
- /**
- * This is required to be set by the client. This is the String that will be inserted at the
- * users selection point.
- *
- * @param string
- */
- public void setInsertionString(String string) {
- insertionString = string;
- }
-
- /**
- * This is a utility method that will parse the methodString and create a IDOMMethod. The
- * DOMFactory will be used to create the method. This new method will be added to the list of
- * methods.
- *
- * @param methodString
- * @see DOMFactory#createMethod(java.lang.String)
- * @link org.eclipse.jdt.core.jdom.IDOMMethod
- */
- public void addMethodFromSourceString(String methodString) {
- if (methodString != null && methodString.length() > 0) {
- if (methods == null)
- methods = new ArrayList();
- methods.add(domFactory.createMethod(methodString));
- }
- }
-
- /**
- * This is a utility method that will parse the fieldString and create a IDOMField. The
- * DOMFactory will be used to create the field. This new field will be added to the list of
- * fields.
- *
- * @param fieldString
- * @see DOMFactory#createField(java.lang.String)
- * @link org.eclipse.jdt.core.jdom.IDOMField
- */
- public void addFieldFromSourceString(String fieldString) {
- if (fieldString != null && fieldString.length() > 0) {
- if (fields == null)
- fields = new ArrayList();
- fields.add(domFactory.createField(fieldString));
- }
- }
-
- /**
- * Add an import that is either the qualified name of a type or a package name with .* at the
- * end.
- *
- * @param importString
- */
- public void addImport(String importString) {
- if (importString != null && importString.length() > 0) {
- if (imports == null)
- imports = new ArrayList();
- imports.add(importString);
- }
- }
-
- /**
- * Return true if the insertionString is set and not a zero length.
- *
- * @return
- */
- public boolean canInsertText() {
- return insertionString != null && insertionString.length() > 0;
- }
-
- /**
- * @return
- */
- public boolean hasFields() {
- return fields != null && !fields.isEmpty();
- }
-
- /**
- * @return
- */
- public boolean hasMethods() {
- return methods != null && !methods.isEmpty();
- }
-
- public boolean hasImports() {
- return imports != null && !imports.isEmpty();
- }
-
- /**
- * @return Returns the imports.
- */
- public List getImportStatements() {
- return imports;
- }
-
- /**
- * @return Returns the extendedOperations.
- */
- public List getExtendedOperations() {
- return extendedOperations;
- }
-
- /**
- * This method allows you to add additional operations which will be performed after this
- * JavaInsertionHelper is processed by the JavaInsertionOperation.
- *
- * @param operation
- * @link JavaInsertionOperation
- */
- public void addExtendedOperation(IHeadlessRunnableWithProgress operation) {
- if (operation != null) {
- if (extendedOperations == null)
- extendedOperations = new ArrayList();
- extendedOperations.add(operation);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModelProvider.java
deleted file mode 100644
index 49467d2..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,48 +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.jst.common.jdt.internal.integration;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProvider;
-
-public class JavaProjectCreationDataModelProvider extends ProjectCreationDataModelProvider implements IJavaProjectCreationProperties {
-
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(OUTPUT_LOCATION);
- propertyNames.add(SOURCE_FOLDERS);
- propertyNames.add(CLASSPATH_ENTRIES);
- propertyNames.add(CREATE_SOURCE_FOLDERS);
- return propertyNames;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new JavaProjectCreationOperation(model);
- }
-
- public Object getDefaultProperty(String propertyName) {
- // TODO pull these from the java preferences
- if (propertyName.equals(OUTPUT_LOCATION)) {
- return "bin"; //$NON-NLS-1$
- }
- if (propertyName.equals(SOURCE_FOLDERS)) {
- return new String[0];
- }
- if (propertyName.equals(CREATE_SOURCE_FOLDERS))
- return Boolean.TRUE;
- return null;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOperation.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOperation.java
deleted file mode 100644
index 12695f8..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOperation.java
+++ /dev/null
@@ -1,113 +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
- *******************************************************************************/
-/*
- * Created on Nov 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.WTPProjectUtilities;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationProperties;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationOperation;
-
-public class JavaProjectCreationOperation extends ProjectCreationOperation {
-
- public JavaProjectCreationOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- super.execute(monitor, info);
- try {
- createJavaProject(monitor);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return OK_STATUS;
- }
-
- private void createJavaProject(IProgressMonitor monitor) throws CoreException {
- IProject project = (IProject) model.getProperty(IProjectCreationProperties.PROJECT);
- WTPProjectUtilities.addNatureToProjectLast(project, JavaCore.NATURE_ID);
- IJavaProject javaProject = JavaCore.create(project);
- javaProject.setOutputLocation(getOutputPath(project), monitor);
- javaProject.setRawClasspath(getClasspathEntries(project), monitor);
- if (model.getBooleanProperty(IJavaProjectCreationProperties.CREATE_SOURCE_FOLDERS)) {
- String[] sourceFolders = (String[]) model.getProperty(IJavaProjectCreationProperties.SOURCE_FOLDERS);
- IFolder folder = null;
- for (int i = 0; i < sourceFolders.length; i++) {
- folder = project.getFolder(sourceFolders[i]);
- folder.create(true, true, monitor);
- }
- }
- }
-
- private IPath getOutputPath(IProject project) {
- String outputLocation = model.getStringProperty(IJavaProjectCreationProperties.OUTPUT_LOCATION);
- return project.getFullPath().append(outputLocation);
- }
-
- private IClasspathEntry[] getClasspathEntries(IProject project) {
- IClasspathEntry[] entries = (IClasspathEntry[]) model.getProperty(IJavaProjectCreationProperties.CLASSPATH_ENTRIES);
- IClasspathEntry[] sourceEntries = null;
- if (model.getBooleanProperty(IJavaProjectCreationProperties.CREATE_SOURCE_FOLDERS))
- sourceEntries = getSourceClasspathEntries(project);
- return combineArrays(sourceEntries, entries);
- }
-
- private IClasspathEntry[] getSourceClasspathEntries(IProject project) {
- String[] sourceFolders = (String[]) model.getProperty(IJavaProjectCreationProperties.SOURCE_FOLDERS);
- ArrayList list = new ArrayList();
- for (int i = 0; i < sourceFolders.length; i++) {
- list.add(JavaCore.newSourceEntry(project.getFullPath().append(sourceFolders[i])));
- }
- IClasspathEntry[] classpath = new IClasspathEntry[list.size()];
- for (int i = 0; i < classpath.length; i++) {
- classpath[i] = (IClasspathEntry) list.get(i);
- }
- return classpath;
- }
-
- private IClasspathEntry[] combineArrays(IClasspathEntry[] sourceEntries, IClasspathEntry[] entries) {
- if (sourceEntries != null) {
- if (entries == null)
- return sourceEntries;
- return doCombineArrays(sourceEntries, entries);
- } else if (entries != null)
- return entries;
- return new IClasspathEntry[0];
- }
-
- private IClasspathEntry[] doCombineArrays(IClasspathEntry[] sourceEntries, IClasspathEntry[] entries) {
- IClasspathEntry[] result = new IClasspathEntry[sourceEntries.length + entries.length];
- System.arraycopy(sourceEntries, 0, result, 0, sourceEntries.length);
- System.arraycopy(entries, 0, result, sourceEntries.length, entries.length);
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java
deleted file mode 100644
index cf2c390..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java
+++ /dev/null
@@ -1,56 +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.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.wst.validation.internal.IValidationSelectionHandler;
-
-
-/**
- * Java Project validation
- */
-public class JavaProjectValidationHandler implements IValidationSelectionHandler {
-
- private String validationType = null;
-
- /**
- * Default constructor
- */
- public JavaProjectValidationHandler() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getBaseValidationType(java.lang.Object)
- */
- public IResource getBaseValidationType(Object selection) {
- if (selection instanceof IJavaProject)
- return ((IJavaProject)selection).getProject();
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getValidationTypeString()
- */
- public String getValidationTypeString() {
- return validationType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#setValidationTypeString(java.lang.String)
- */
- public void setValidationTypeString(String validationType) {
- this.validationType = validationType;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
deleted file mode 100644
index fa74acc..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
+++ /dev/null
@@ -1,542 +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.jst.common.jdt.internal.integration;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.ISaveHandler;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerHeadless;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerRegister;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Insert the type's description here. Creation date: (4/27/2001 4:14:30 PM)
- *
- * @author: Administrator
- */
-public class WTPWorkingCopyManager implements WorkingCopyManager {
-
- //New CUs that will need to be deleted upon dispose
- private List originalNewCompilationUnits;
- //New CUs that were created that need saved immediately (after each gen)
- private List needsSavingCompilationUnits;
- //A complete list of new CUs that is only cleared on save and dispose
- private List newCompilationUnits;
- private HashMap deletedCompilationUnits;
- protected static final Class IRESOURCE_CLASS = IResource.class;
-
- /**
- * WTPWorkingCopyManager constructor comment.
- */
- public WTPWorkingCopyManager() {
- super();
- }
-
- protected void addDeletedCompilationUnit(ICompilationUnit cu) {
- getNeedsSavingCompilationUnits().remove(cu);
- if (!getOriginalNewCompilationUnits().contains(cu) && !getDeletedCompilationUnits().containsKey(cu))
- primAddDeletedCompilationUnit(cu);
- getOriginalNewCompilationUnits().remove(cu);
- }
-
- protected void addNewCompilationUnit(ICompilationUnit cu, ICompilationUnit workingCopy) {
- getNewCompilationUnits().add(cu);
- getNeedsSavingCompilationUnits().add(workingCopy);
- if (!getDeletedCompilationUnits().containsKey(cu))
- getOriginalNewCompilationUnits().add(cu);
- }
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- protected void commitWorkingCopy(ICompilationUnit wc, IProgressMonitor monitor) {
- try {
- try {
- wc.commitWorkingCopy(false, monitor);
- } catch (JavaModelException e) {
- if (isFailedWriteFileFailure(e) && shouldSaveReadOnly(wc))
- wc.commitWorkingCopy(false, monitor);
- else
- throw e;
- }
- } catch (JavaModelException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- throw new SaveFailedException(e);
- } finally {
- try {
- wc.discardWorkingCopy();
- } catch (JavaModelException e1) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e1);
- throw new SaveFailedException(e1);
- }
- }
- }
-
- /**
- * This will delete
- *
- * @cu from the workbench and fix the internal references for this working copy manager.
- */
- public void delete(ICompilationUnit cu, IProgressMonitor monitor) {
- if (cu.isWorkingCopy())
- cu = cu.getPrimary();
- addDeletedCompilationUnit(cu);
- try {
- cu.delete(false, monitor);
- } catch (JavaModelException e) {
- if (e.getStatus().getCode() != org.eclipse.jdt.core.IJavaModelStatusConstants.ELEMENT_DOES_NOT_EXIST)
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- }
- }
-
- protected void discardOriginalNewCompilationUnits() {
- if (getOriginalNewCompilationUnits().isEmpty())
- return;
- List cus = getOriginalNewCompilationUnits();
- ICompilationUnit cu;
- ICompilationUnit wc = null;
- for (int i = 0; i < cus.size(); i++) {
- cu = (ICompilationUnit) cus.get(i);
- if (cu.isWorkingCopy()) {
- wc = cu;
- cu = wc.getPrimary();
- }
- primDelete(cu);
- if (wc != null)
- try {
- wc.discardWorkingCopy();
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- public void dispose() {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primDispose();
- }
- };
- try {
- if (!WTPCommonPlugin.getWorkspace().isTreeLocked()) {
- WTPCommonPlugin.getWorkspace().run(runnable,null, IWorkspace.AVOID_UPDATE,null);
- } else {
- runnable.run(null);
- }
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- //runOperation(runnable, null, true);
- }
-
- public void revert() {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primRevert();
- }
- };
- runOperation(runnable, null, true);
- }
-
- public Set getAffectedFiles() {
- return Collections.EMPTY_SET;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 6:43:37 PM)
- *
- * @return java.util.HashMap
- */
- protected HashMap getDeletedCompilationUnits() {
- if (deletedCompilationUnits == null)
- deletedCompilationUnits = new HashMap();
- return deletedCompilationUnits;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input. Does not connect the edit model to the working copy.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException {
- ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(cu);
- if (newCU != null)
- return newCU;
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/19/2001 11:00:19 AM)
- *
- * @return java.util.List
- */
- protected java.util.List getNeedsSavingCompilationUnits() {
- if (needsSavingCompilationUnits == null)
- needsSavingCompilationUnits = new ArrayList();
- return needsSavingCompilationUnits;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/26/2001 3:49:05 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getNewCompilationUnits() {
- if (newCompilationUnits == null)
- newCompilationUnits = new ArrayList();
- return newCompilationUnits;
- }
-
- /**
- * It is possible that we have already created this CompilationUnit and its working copy. If
- * this is the case, return our new working copy and do not create a new one.
- */
- protected ICompilationUnit getNewCompilationUnitWorkingCopy(ICompilationUnit cu) {
- if (hasNewCompilationUnit(cu)) {
- List list = getNeedsSavingCompilationUnits();
- ICompilationUnit copy;
- for (int i = 0; i < list.size(); i++) {
- copy = (ICompilationUnit) list.get(i);
- if (cu.equals(copy.getPrimary()))
- return copy;
- }
- }
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/26/2001 3:49:05 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getOriginalNewCompilationUnits() {
- if (originalNewCompilationUnits == null)
- originalNewCompilationUnits = new ArrayList();
- return originalNewCompilationUnits;
- }
-
- /**
- * Return the IPackageFragment for the given ICompilationUnit.
- */
- protected IPackageFragment getPackageFragment(ICompilationUnit cu) {
- if (cu == null)
- return null;
- IJavaElement parent = cu;
- int elementType = cu.getElementType();
- while (parent != null && elementType != IJavaElement.PACKAGE_FRAGMENT) {
- parent = parent.getParent();
- if (parent != null)
- elementType = parent.getElementType();
- else
- elementType = -1;
- }
- return (IPackageFragment) parent;
- }
-
- protected ISaveHandler getSaveHandler() {
- return SaveHandlerRegister.getSaveHandler();
- }
-
- /**
- * Returns the working copy remembered for the compilation unit.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if there is no
- * remembered working copy for this compilation unit
- */
- public ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
- if (cu == null || cu.isWorkingCopy())
- return cu;
- ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(cu);
- if (newCU != null)
- return newCU;
- ICompilationUnit workingCopy = cu.getWorkingCopy(null);
- addNewCompilationUnit(cu, workingCopy);
- return workingCopy;
- }
-
- /**
- * Has a new compilation unit already been created.
- */
- protected boolean hasNewCompilationUnit(ICompilationUnit cu) {
- return getNewCompilationUnits().contains(cu);
- }
-
- protected boolean isFailedWriteFileFailure(Exception ex) {
- return SaveHandlerHeadless.isFailedWriteFileFailure(ex);
- }
-
- protected void primAddDeletedCompilationUnit(ICompilationUnit cu) {
- if (cu == null)
- return;
- Object[] info = new Object[2];
- info[0] = getPackageFragment(cu);
- try {
- info[1] = cu.getSource();
- } catch (JavaModelException e) {
- info[1] = null;
- }
- getDeletedCompilationUnits().put(cu, info);
- }
-
- // This is an internal delete call.
- protected void primDelete(ICompilationUnit cu) {
- try {
- if (cu.exists())
- cu.delete(true, new org.eclipse.core.runtime.NullProgressMonitor());
- } catch (JavaModelException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- //What to do here?
- }
- }
-
- protected void primDispose() {
- discardOriginalNewCompilationUnits();
- reviveDeletedCompilationUnits();
- newCompilationUnits = null;
- needsSavingCompilationUnits = null;
- originalNewCompilationUnits = null;
- deletedCompilationUnits = null;
- }
-
- protected void primRevert() {
- discardOriginalNewCompilationUnits();
- reviveDeletedCompilationUnits();
- newCompilationUnits = null;
- needsSavingCompilationUnits = null;
- originalNewCompilationUnits = null;
- deletedCompilationUnits = null;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- protected ICompilationUnit primGetWorkingCopy(ICompilationUnit cu) throws CoreException {
- return null;
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- protected void primSaveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- saveNewCompilationUnits(monitor);
- getDeletedCompilationUnits().clear();
- }
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- protected void primSaveOnlyNewCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- List cus = getNeedsSavingCompilationUnits();
- ICompilationUnit wc;
- for (int i = 0; i < cus.size(); i++) {
- wc = (ICompilationUnit) cus.get(i);
- commitWorkingCopy(wc, monitor);
- }
- cus.clear();
- }
-
- protected void removeDeletedCompilationUnit(ICompilationUnit cu) {
- if (getDeletedCompilationUnits().remove(cu) != null) {
- if (cu.isWorkingCopy()) {
- ICompilationUnit original, nextCU, testCU;
- original = cu.getPrimary();
- Set cus = getDeletedCompilationUnits().keySet();
- Iterator it = cus.iterator();
- while (it.hasNext()) {
- nextCU = (ICompilationUnit) it.next();
- testCU = nextCU.isWorkingCopy() ? (ICompilationUnit) nextCU.getPrimary() : nextCU;
- if (testCU.equals(original)) {
- cus.remove(nextCU);
- return;
- }
- }
- }
- }
- }
-
- protected void reviveDeletedCompilationUnit(ICompilationUnit cu, Object[] info, IProgressMonitor pm) {
- if (info[0] != null && info[1] != null) {
- String typeName = cu.getElementName();
- IPackageFragment pack = (IPackageFragment) info[0];
- String source = (String) info[1];
- try {
- ICompilationUnit existingCU = pack.getCompilationUnit(typeName);
- if (existingCU.exists() && getNewCompilationUnits().contains(existingCU))
- existingCU.delete(false, pm);
- pack.createCompilationUnit(typeName, source, false, pm);
- } catch (JavaModelException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- }
- }
- }
-
- protected void reviveDeletedCompilationUnits() {
- if (getDeletedCompilationUnits().isEmpty())
- return;
- IProgressMonitor pm = new org.eclipse.core.runtime.NullProgressMonitor();
- Iterator it = getDeletedCompilationUnits().entrySet().iterator();
- Map.Entry entry;
- ICompilationUnit cu;
- Object[] info;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- cu = (ICompilationUnit) entry.getKey();
- info = (Object[]) entry.getValue();
- reviveDeletedCompilationUnit(cu, info, pm);
- }
-
- }
-
- protected void runOperation(IWorkspaceRunnable aRunnable, IProgressMonitor monitor, boolean validate) {
- primRunOperation(aRunnable, monitor);
-
- // TODO Break the validator depedency
- // if (validate)
- // primRunOperation(aRunnable, monitor);
- // else {
- // IProject proj = getValidationProject();
- //
- // ValidatorManager mgr = ValidatorManager.getManager();
- // boolean disableValidators = proj != null;
- // boolean wasSuspended = false;
- // if (disableValidators) {
- // wasSuspended = mgr.isSuspended(proj);
- // if (!wasSuspended)
- // mgr.suspendValidation(proj, true);
- // }
- // try {
- // primRunOperation(aRunnable, monitor);
- // } finally {
- // if (disableValidators && !wasSuspended)
- // mgr.suspendValidation(proj, false);
- // }
- // }
- }
-
- protected void primRunOperation(IWorkspaceRunnable aRunnable, IProgressMonitor monitor) {
-
- if (aRunnable != null) {
- //if (workspace.isTreeLocked())
- //Logger.getLogger().logTrace(ResourceHandler.getString("Cannot_run_J2EEUIWorkingCo_ERROR_"));
- // //$NON-NLS-1$ = "Cannot run J2EEUIWorkingCopyManager operation because the Workspace
- // tree is locked."
- //else {
- if (!WTPCommonPlugin.getWorkspace().isTreeLocked()) {
- try {
- WTPCommonPlugin.getWorkspace().run(aRunnable, monitor);
- } catch (CoreException e) {
- throw new SaveFailedException(e);
- }
- }
- }
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- public void saveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- getSaveHandler().access();
- try {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primSaveCompilationUnits(aMonitor);
- }
- };
- runOperation(runnable, monitor, true);
- } catch (SaveFailedException ex) {
- getSaveHandler().handleSaveFailed(ex, monitor);
- } finally {
- getSaveHandler().release();
- }
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- protected void saveNewCompilationUnits(IProgressMonitor monitor) {
- primSaveOnlyNewCompilationUnits(monitor);
- getOriginalNewCompilationUnits().clear();
- getNewCompilationUnits().clear();
- }
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- public void saveOnlyNewCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- getSaveHandler().access();
- try {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primSaveOnlyNewCompilationUnits(aMonitor);
- }
- };
- runOperation(runnable, monitor, false);
- } catch (SaveFailedException ex) {
- getSaveHandler().handleSaveFailed(ex, monitor);
- } finally {
- getSaveHandler().release();
- }
- }
-
- protected boolean shouldSaveReadOnly(ICompilationUnit wc) {
- IResource resource = null;
-
- resource = (IResource) wc.getPrimary().getAdapter(IRESOURCE_CLASS);
-
- if (resource == null || resource.getType() != IResource.FILE || !resource.getResourceAttributes().isReadOnly())
- return false;
-
- return getSaveHandler().shouldContinueAndMakeFileEditable((IFile) resource);
- }
-
- /**
- * @see com.ibm.etools.j2ee.workbench.IJ2EEWorkingCopyManager#hasWorkingCopies()
- */
- public boolean hasWorkingCopies() {
- return (deletedCompilationUnits != null && !deletedCompilationUnits.isEmpty()) || (needsSavingCompilationUnits != null && !needsSavingCompilationUnits.isEmpty()) || (newCompilationUnits != null && !newCompilationUnits.isEmpty());
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java
deleted file mode 100644
index 35ccc89..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java
+++ /dev/null
@@ -1,49 +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.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-/**
- * @author Administrator
- *
- *
- */
-public interface WorkingCopyManager extends WorkingCopyProvider {
-
- void dispose();
-
- java.util.Set getAffectedFiles();
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- void saveCompilationUnits(IProgressMonitor monitor);
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- void saveOnlyNewCompilationUnits(IProgressMonitor monitor);
-
- /**
- * Method hasWorkingCopies.
- *
- * @return boolean
- */
- boolean hasWorkingCopies();
-
- /**
- * Revert all working copies.
- */
- void revert();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java
deleted file mode 100644
index 3e98f8a..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java
+++ /dev/null
@@ -1,57 +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.jst.common.jdt.internal.integration;
-
-import org.eclipse.jem.util.UIContextDetermination;
-
-
-/**
- * @author mdelder
- *
- *
- */
-public class WorkingCopyManagerFactory {
-
- // protected static Class workingCopyManagerClass;
-
- public static WorkingCopyManager newRegisteredInstance() {
- return (WorkingCopyManager) UIContextDetermination.createInstance("workingCopyManager"); //$NON-NLS-1$
- }
-
- // public static IWorkingCopyManager createWorkingCopyManager() {
- // if (getWorkingCopyManagerClass() != null)
- // try {
- // return (IWorkingCopyManager) getWorkingCopyManagerClass().newInstance();
- // } catch (InstantiationException e1) {
- // } catch (IllegalAccessException e2) {
- // }
- // return null;
- // }
- //
- // /**
- // * Insert the method's description here.
- // * Creation date: (4/26/2001 7:53:15 AM)
- // * @return java.lang.Class
- // */
- // public static java.lang.Class getWorkingCopyManagerClass() {
- // return workingCopyManagerClass;
- // }
- //
- // /**
- // * Insert the method's description here.
- // * Creation date: (4/26/2001 7:53:15 AM)
- // * @param newWorkingCopyManagerClass java.lang.Class
- // */
- // public static void setWorkingCopyManagerClass(java.lang.Class newWorkingCopyManagerClass) {
- // workingCopyManagerClass = newWorkingCopyManagerClass;
- // }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java
deleted file mode 100644
index 2696f5c..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java
+++ /dev/null
@@ -1,60 +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.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-
-
-/**
- * The user of the Java code generation framework must supply an implementation of this interface.
- * The framework will obtain compilation working copies from this interface. The supplier of the
- * implementation is responsible for committing the working copies when appropriate for the user's
- * edit model.
- */
-public interface WorkingCopyProvider {
-
- /**
- * This will delete compilation unit from the workbench and fix the internal references for this
- * working copy manager.
- *
- * @param cu
- * the compilation unit to delete
- * @param monitor
- * the progress monitor to use for the delete
- */
- void delete(ICompilationUnit cu, IProgressMonitor monitor);
-
- /**
- * Returns the working copy remembered for the compilation unit. That is, the manager already
- * has a working copy for this unit, it does not create a new working copy. Does not connect the
- * edit model to the working copy.
- *
- * @param input
- * the compilation unit
- * @return the working copy of the compilation unit, or <code>null</code> it there is no
- * remembered working copy for this compilation unit
- */
- ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException;
-
- /**
- * Returns the working copy remembered for the compilation unit or creates a new working copy
- * for the compilation unit and returns it. If a working copy is passed in, it is returned.
- *
- * @param input
- * the compilation unit
- * @return the working copy of the compilation unit
- * @exception CoreException
- * if the working copy can not be created
- */
- ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws CoreException;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/IJavaFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/IJavaFacetInstallDataModelProperties.java
deleted file mode 100644
index 6bf8276..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/IJavaFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,16 +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.jst.common.project.facet;
-
-public interface IJavaFacetInstallDataModelProperties {
-
- public static final String SOURCE_FOLDER_NAME = "IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDataModelProvider.java
deleted file mode 100644
index 37d5f98..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,50 +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.jst.common.project.facet;
-
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-public class JavaFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements IJavaFacetInstallDataModelProperties {
-
- public JavaFacetInstallDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(SOURCE_FOLDER_NAME);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (FACET_ID.equals(propertyName)) {
- return IModuleConstants.JST_JAVA;
- } else if (FACET_VERSION.equals(propertyName)) {
- Hashtable javaOptions = JavaCore.getOptions();
- String jdtVersion = (String)javaOptions.get(JavaCore.COMPILER_COMPLIANCE);
- if (jdtVersion.startsWith("1.3")) { //$NON-NLS-1$
- return JavaFacetUtils.JAVA_13;
- } else if (jdtVersion.startsWith("1.4")) { //$NON-NLS-1$
- return JavaFacetUtils.JAVA_14;
- }
- return JavaFacetUtils.JAVA_50;
- } else if (SOURCE_FOLDER_NAME.equals(propertyName)) {
- return "src";
- }
- return super.getDefaultProperty(propertyName);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDelegate.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDelegate.java
deleted file mode 100644
index 53e1559..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDelegate.java
+++ /dev/null
@@ -1,103 +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.jst.common.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-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.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) cfg;
-
- // Create the source and the output directories.
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
-
- final IPath pjpath = project.getFullPath();
- IJavaProject jproject = null;
- if( project.exists()){
- jproject = JavaCore.create(project);
- }
-
- if( !jproject.exists()){
- String srcFolderName = model.getStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME);
- final IPath srcdir = pjpath.append(srcFolderName);
-
- final IPath outdir = pjpath.append("build/classes"); //$NON-NLS-1$
-
- ws.getRoot().getFolder(srcdir).getLocation().toFile().mkdirs();
- ws.getRoot().getFolder(outdir).getLocation().toFile().mkdirs();
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
-
- // Add the java nature. This will automatically add the builder.
-
- 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] = JavaCore.NATURE_ID;
- desc.setNatureIds(replacement);
- project.setDescription(desc, null);
-
- // Set up the sourcepath and the output directory.
-
- final IJavaProject jproj = JavaCore.create(project);
- final IClasspathEntry[] cp = {JavaCore.newSourceEntry(srcdir)};
-
- jproj.setRawClasspath(cp, outdir, null);
- jproj.save(null, true);
-
- // Setup the classpath.
-
- JavaFacetUtils.resetClasspath( project, null, fv );
- }
-
- // Set the compiler comliance level for the project. Ignore whether
- // this might already be set so at the workspace level in case
- // workspace settings change later or the project is included in a
- // different workspace.
-
- JavaFacetUtils.setCompilerLevel(project, fv);
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetRuntimeChangedDelegate.java
deleted file mode 100644
index 2333cd9..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,60 +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.jst.common.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaFacetRuntimeChangedDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- JavaFacetUtils.resetClasspath( project, fv, fv );
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.java
deleted file mode 100644
index a231e5f..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.java
+++ /dev/null
@@ -1,283 +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.jst.common.project.facet;
-
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ProjectScope;
-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.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.osgi.util.NLS;
-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.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaFacetUtils
-{
- public static final IProjectFacet JAVA_FACET
- = ProjectFacetsManager.getProjectFacet( IModuleConstants.JST_JAVA );
-
- public static final IProjectFacetVersion JAVA_13
- = JAVA_FACET.getVersion( "1.3" );
-
- public static final IProjectFacetVersion JAVA_14
- = JAVA_FACET.getVersion( "1.4" );
-
- public static final IProjectFacetVersion JAVA_50
- = JAVA_FACET.getVersion( "5.0" );
-
- public static String getCompilerLevel( final IProject project )
- {
- IScopeContext context = new ProjectScope( project );
- IEclipsePreferences prefs = context.getNode( JavaCore.PLUGIN_ID );
- String level = prefs.get( JavaCore.COMPILER_COMPLIANCE, null );
-
- if( level == null )
- {
- context = new InstanceScope();
- prefs = context.getNode( JavaCore.PLUGIN_ID );
- level = prefs.get( JavaCore.COMPILER_COMPLIANCE, null );
- }
-
- if( level == null )
- {
- final Hashtable defaults = JavaCore.getDefaultOptions();
- level = (String) defaults.get( JavaCore.COMPILER_COMPLIANCE );
- }
-
- return level;
- }
-
- public static void setCompilerLevel( final IProject project,
- final IProjectFacetVersion fv )
-
- throws CoreException
-
- {
- setCompilerLevel( project, facetToCompilerLevel( fv ) );
- }
-
- public static void setCompilerLevel( final IProject project,
- final String level )
-
- throws CoreException
-
- {
- final IScopeContext context = new ProjectScope( project );
-
- final IEclipsePreferences prefs
- = context.getNode( JavaCore.PLUGIN_ID );
-
- if( level.equals( JavaCore.VERSION_1_3 ) )
- {
- prefs.put( JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_3 );
- prefs.put( JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_1 );
- prefs.put( JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_3 );
- prefs.put( JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.IGNORE );
- prefs.put( JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.IGNORE );
- }
- else if( level.equals( JavaCore.VERSION_1_4 ) )
- {
- prefs.put( JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_4 );
- prefs.put( JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_2 );
- prefs.put( JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_3 );
- prefs.put( JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.WARNING );
- prefs.put( JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.WARNING );
- }
- else if( level.equals( JavaCore.VERSION_1_5 ) )
- {
- prefs.put( JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5 );
- prefs.put( JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_5 );
- prefs.put( JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5 );
- prefs.put( JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR );
- prefs.put( JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.ERROR );
- }
- else
- {
- throw new IllegalStateException();
- }
-
- try
- {
- prefs.flush();
- }
- catch( BackingStoreException e )
- {
- // TODO: Handle this.
- }
- }
-
- public static void scheduleFullBuild( final IProject project )
- {
- final String msg
- = NLS.bind( Resources.buildingMsg, project.getName() );
-
- final Job buildJob = new Job( msg )
- {
- public IStatus run( final IProgressMonitor monitor )
- {
- try
- {
- project.build( IncrementalProjectBuilder.FULL_BUILD,
- monitor );
- }
- catch( CoreException e )
- {
- return e.getStatus();
- }
-
- return Status.OK_STATUS;
- }
- };
-
- buildJob.setRule( ResourcesPlugin.getWorkspace().getRoot() );
- buildJob.schedule();
- }
-
- public static void resetClasspath( final IProject project,
- final IProjectFacetVersion oldver,
- final IProjectFacetVersion newver )
-
- throws CoreException
-
- {
- if( oldver != null )
- {
- ClasspathHelper.removeClasspathEntries( project, oldver );
- }
-
- // If this was a java project before it became a faceted project or
- // the JRE container has been added manually, the above method will not
- // delete the old JRE container. Do it manually.
-
- removeJreContainer( project );
-
- if( ! ClasspathHelper.addClasspathEntries( project, newver ) )
- {
- final IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-
- if( vm != null )
- {
- IPath path = new Path( JavaRuntime.JRE_CONTAINER );
- path = path.append( vm.getVMInstallType().getId() );
- path = path.append( vm.getName() );
-
- final IClasspathEntry cpe
- = JavaCore.newContainerEntry( path );
-
- final List entries = Collections.singletonList( cpe );
-
- ClasspathHelper.addClasspathEntries( project, newver, entries );
- }
- }
- }
-
- private static void removeJreContainer( final IProject proj )
-
- throws CoreException
-
- {
- final IJavaProject jproj = JavaCore.create( proj );
- final IClasspathEntry[] cp = jproj.getRawClasspath();
-
- int pos = -1;
-
- for( int i = 0; i < cp.length; i++ )
- {
- final IClasspathEntry cpe = cp[ i ];
-
- if( cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER &&
- cpe.getPath().segment( 0 ).equals( JavaRuntime.JRE_CONTAINER ) )
- {
- pos = i;
- break;
- }
- }
-
- if( pos == -1 )
- {
- return;
- }
-
- final IClasspathEntry[] newcp
- = new IClasspathEntry[ cp.length - 1 ];
-
- System.arraycopy( cp, 0, newcp, 0, pos );
- System.arraycopy( cp, pos + 1, newcp, pos, newcp.length - pos );
-
- jproj.setRawClasspath( newcp, null );
- }
-
- public static IProjectFacetVersion compilerLevelToFacet( final String ver )
- {
- if( ver.equals( "1.5" ) )
- {
- return JavaFacetUtils.JAVA_50;
- }
- else
- {
- return JavaFacetUtils.JAVA_FACET.getVersion( ver );
- }
- }
-
- public static String facetToCompilerLevel( final IProjectFacetVersion fv )
- {
- if( fv == JAVA_50 )
- {
- return JavaCore.VERSION_1_5;
- }
- else
- {
- return fv.getVersionString();
- }
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String buildingMsg;
-
- static
- {
- initializeMessages( JavaFacetUtils.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.properties b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.properties
deleted file mode 100644
index 9f14d1c..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.properties
+++ /dev/null
@@ -1 +0,0 @@
-buildingMsg = Building Project {0}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetValidator.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetValidator.java
deleted file mode 100644
index 2368d49..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetValidator.java
+++ /dev/null
@@ -1,71 +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.jst.common.project.facet;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectValidator;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaFacetValidator
-
- implements IFacetedProjectValidator
-
-{
- public static final String MARKER_ID
- = "org.eclipse.jst.common.frameworks.javaVersionMismatch";
-
- public static final String ATTR_FACET_VERSION = "facetVersion";
- public static final String ATTR_COMPILER_LEVEL = "compilerLevel";
-
- public void validate( final IFacetedProject fproj )
-
- throws CoreException
-
- {
- final String level
- = JavaFacetUtils.getCompilerLevel( fproj.getProject() );
-
- final IProjectFacetVersion fv
- = fproj.getInstalledVersion( JavaFacetUtils.JAVA_FACET );
-
- if( JavaFacetUtils.compilerLevelToFacet( level ) != fv )
- {
- final IMarker marker
- = fproj.createErrorMarker( MARKER_ID, Resources.versionsDontMatch );
-
- marker.setAttribute( ATTR_FACET_VERSION, fv.getVersionString() );
- marker.setAttribute( ATTR_COMPILER_LEVEL, level );
- }
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String versionsDontMatch;
-
- static
- {
- initializeMessages( JavaFacetValidator.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetValidator.properties b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetValidator.properties
deleted file mode 100644
index bcd233c..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetValidator.properties
+++ /dev/null
@@ -1 +0,0 @@
-versionsDontMatch = Java compiler level does not match the version of the installed Java project facet.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetVersionChangeDelegate.java
deleted file mode 100644
index e1e26c0..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetVersionChangeDelegate.java
+++ /dev/null
@@ -1,80 +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.jst.common.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaFacetVersionChangeDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- // Find the version that's currently installed.
-
- final IFacetedProject fproj
- = ProjectFacetsManager.create( project );
-
- final IProjectFacetVersion oldver
- = fproj.getInstalledVersion( fv.getProjectFacet() );
-
- // Reset the classpath.
-
- JavaFacetUtils.resetClasspath( project, oldver, fv );
-
- // Reset the compiler level.
-
- JavaFacetUtils.setCompilerLevel( project, fv );
-
- // Schedule a full build of the project.
-
- JavaFacetUtils.scheduleFullBuild( project );
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/WtpUtils.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/WtpUtils.java
deleted file mode 100644
index 44a12d2..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/WtpUtils.java
+++ /dev/null
@@ -1,70 +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.jst.common.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WtpUtils
-{
- private WtpUtils() {}
-
- private static final String WTP_NATURE
- = "org.eclipse.wst.common.modulecore.ModuleCoreNature";
-
- private static final String JEM_NATURE
- = "org.eclipse.jem.workbench.JavaEMFNature";
-
- public static void addNatures( final IProject project )
-
- throws CoreException
-
- {
- final IProjectDescription desc = project.getDescription();
- final String[] current = desc.getNatureIds();
- final String[] replacement = new String[ current.length + 2 ];
- System.arraycopy( current, 0, replacement, 0, current.length );
- replacement[ current.length ] = WTP_NATURE;
- replacement[ current.length + 1 ] = JEM_NATURE;
- desc.setNatureIds( replacement );
- project.setDescription( desc, null );
- }
-
- public static void addNaturestoEAR( 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 ] = WTP_NATURE;
- desc.setNatureIds( replacement );
- project.setDescription( desc, null );
- }
-
- public static void removeNatures( final IProject project )
-
- throws CoreException
-
- {
- ProjectUtilities.removeNatureFromProject( project, WTP_NATURE );
- ProjectUtilities.removeNatureFromProject( project, JEM_NATURE );
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath b/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath
deleted file mode 100644
index e04d8eb..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="jca_ui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore
deleted file mode 100644
index ec7a42c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-jcaui.jar
-temp.folder
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.project b/plugins/org.eclipse.jst.j2ee.jca.ui/.project
deleted file mode 100644
index 56ec9d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.jca.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>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 5b69bf9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WTP JCA UI Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.jca.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.jca.ui.internal.plugin.JCAUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.j2ee.jca.ui.internal.actions,
- org.eclipse.jst.j2ee.jca.ui.internal.plugin,
- org.eclipse.jst.j2ee.jca.ui.internal.util,
- org.eclipse.jst.j2ee.jca.ui.internal.wizard
-Require-Bundle: org.eclipse.jst.j2ee.ui,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.jface,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.jca,
- org.eclipse.jst.j2ee.core,
- org.eclipse.core.resources,
- org.eclipse.wst.common.navigator.workbench,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.web.ui
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/about.html b/plugins/org.eclipse.jst.j2ee.jca.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties
deleted file mode 100644
index f57586f..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-source.. = jca_ui/,\
- property_files/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html
-src.includes = plugin.properties,\
- plugin.xml
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java
deleted file mode 100644
index b970f25..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java
+++ /dev/null
@@ -1,59 +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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportRARAction extends BaseAction {
-
- private String label = JCAUIMessages.connector_export_action_label_ui_;
- private static final String ICON = "export_rar_wiz"; //$NON-NLS-1$
-
- public ExportRARAction() {
- super();
- setText(label);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- protected void primRun(Shell shell) {
- ConnectorComponentExportWizard wizard = new ConnectorComponentExportWizard();
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
- wizard.init(plugin.getWorkbench(), selection);
- wizard.setDialogSettings(plugin.getDialogSettings());
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java
deleted file mode 100644
index b2c5fc5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java
+++ /dev/null
@@ -1,64 +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.jst.j2ee.jca.ui.internal.actions;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-
-/**
- * Defines constants for Connector Archive operations.
- */
-public interface IConnectorArchiveConstants {
-
- //Actions
- public static final String CONNECTOR_EXPORT_ACTION_LABEL = "%connector.export.action.label_ui_"; //$NON-NLS-1$
-
- //General
- public static final String CONNECTOR_PROJECT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Project_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_FILE_UI_ = RARArchiveUIResourceHandler.getString("Connector_File_UI_"); //$NON-NLS-1$
- public static final String STORE_CONNECTOR_FILE_NAMES_ID = "EJBImportWizardPage1.STORE_CONNECTOR_FILE_NAMES_ID"; //$NON-NLS-1$
- public static final String STORE_CONNECTOR_EXPORT_FILE_NAMES = "ConenctorExportWizardPage1.STORE_CONNECTOR_EXPORT_FILE_NAMES"; //$NON-NLS-1$
- public static final String WIZ_IMAGE = "connector_import_wiz"; //$NON-NLS-1$
- public static final String ID = "id"; //$NON-NLS-1$
- public static final String RAR_BROWSE_BUTTON_FILTER = "*.rar"; //$NON-NLS-1$
- public static final String TARGET_EXTENSION = "rar"; //$NON-NLS-1$
- public static final String YES_UI_ = RARArchiveUIResourceHandler.getString("Yes_UI_"); //$NON-NLS-1$
- public static final String NO_UI_ = RARArchiveUIResourceHandler.getString("No_UI_"); //$NON-NLS-1$
- public static final String QUESTION_UI_ = RARArchiveUIResourceHandler.getString("Question_UI_"); //$NON-NLS-1$
- public static final String RESOURCE__UI_ = "Resource_{0}_already_exists.__Would_you_like_to_overwrite_it_UI_"; //$NON-NLS-1$
- //Import
- public static final String IMPORT_UI_ = RARArchiveUIResourceHandler.getString("Import_UI_"); //$NON-NLS-1$
- public static final String IMPORT_A_CONNECTOR_UI_ = RARArchiveUIResourceHandler.getString("Import_a_Connector_project_from_the_file_system_UI_"); //$NON-NLS-1$
- public static final String IMPORT_INTO_NEW_OR_EXISTING_UI_ = RARArchiveUIResourceHandler.getString("Import_into_new_or_existing_Enterprise_Application_project_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_IMPORT_ID_ = "ConnectorProjectImportPage1"; //$NON-NLS-1$
- public static final String CONNECTOR_IMPORT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Import_UI_"); //$NON-NLS-1$
- public static final String IRAR1000 = J2EEUIPlugin.PLUGIN_ID + ".irar1000"; //$NON-NLS-1$
-
- //Export
- public static final String CONNECTOR_EXPORT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Export_UI_"); //$NON-NLS-1$
- public static final String EXPORT_CONNECTOR__UI_ = RARArchiveUIResourceHandler.getString("Export_Connector_Project_to_the_local_file_system_UI_"); //$NON-NLS-1$
- public static final String WORKBENCH_ID = "ConnectorExportPage1"; //$NON-NLS-1$
- public static final String EXPORT_UI_ = RARArchiveUIResourceHandler.getString("Export_UI_"); //$NON-NLS-1$
- public static final String EX_WIZ_IMAGE = "connector_export_wiz"; //$NON-NLS-1$
- public static final String ERAR1000 = J2EEUIPlugin.PLUGIN_ID + ".erar1000"; //$NON-NLS-1$
-
- //Errors
- public static final String UNABLE_TO_COMPLETE_THE_OPEN_ERROR_ = RARArchiveUIResourceHandler.getString("Unable_to_complete_the_operationdump_caused_by_this_UI_"); //$NON-NLS-1$
- public static final String IMPORT_PROBLEMS_UI_ = RARArchiveUIResourceHandler.getString("Import_Problems_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_IMPORT__UI_ = RARArchiveUIResourceHandler.getString("Connector_Import_Error_UI_"); //$NON-NLS-1$
- public static final String IMPORT_ERROR_UI_ = RARArchiveUIResourceHandler.getString("Import_Error_UI_"); //$NON-NLS-1$
- public static final String THE_JAR_FILE_DOES_NOT_EXIST_UI_ = RARArchiveUIResourceHandler.getString("The_jar_file_does_not_exist_or_cannot_be_opened,_UI_") + //$NON-NLS-1$
- RARArchiveUIResourceHandler.getString("Click_browse_to_select_a_valid_jar_or_enter_a_valid_jar_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_EXPORT_ERROR_UI_ = RARArchiveUIResourceHandler.getString("Connector_Export_Error_UI_"); //$NON-NLS-1$
- public static final String CANNOT_EXPORT_CLOSED_PROJECT_UI_ = RARArchiveUIResourceHandler.getString("Cannot_export_closed_projects_UI_"); //$NON-NLS-1$
- public static final String Rar_File_Name_Needed_UI_ = RARArchiveUIResourceHandler.getString("Rar_File_Name_Needed_UI_"); //$NON-NLS-1$
-
-}// IConnectorArchiveConstants
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java
deleted file mode 100644
index 93d0d66..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java
+++ /dev/null
@@ -1,59 +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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportRARAction extends BaseAction {
- public static String LABEL = RARArchiveUIResourceHandler.getString("Import_RAR"); //$NON-NLS-1$
- private static final String ICON = "import_rar_wiz"; //$NON-NLS-1$
-
- public ImportRARAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- protected void primRun(Shell shell) {
-
- ConnectorComponentImportWizard wizard = new ConnectorComponentImportWizard();
-
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
- wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java
deleted file mode 100644
index 884a2f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java
+++ /dev/null
@@ -1,77 +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.jst.j2ee.jca.ui.internal.actions;
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-
-/**
- * Creates an action for the Connector project
- */
-public class NewConnectorComponentAction extends AbstractOpenWizardWorkbenchAction {
-
- // TODO MDE 02-28 Find correct label
- public static String LABEL = JCAUIMessages.JCA_MODULE_WIZ_TITLE;
- private static final String ICON = "newear_wiz"; //$NON-NLS-1$
-
- /**
- * Default constructor
- */
- public NewConnectorComponentAction() {
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }// NewConnectorProjectAction
-
- /**
- * Constructor initialization.
- *
- * @param IWorkbench
- * workbench - Workbench to add to this wizard too.
- * @param String
- * label - Label for project.
- * @param Class[]
- * acceptedTypes - List of accepted types for this wizard
- */
- public NewConnectorComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
- super(workbench, label, acceptedTypes, false);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }// NewConnectorProjectAction
-
- /**
- * Creates the wizard
- *
- * @return Wizard
- */
- protected Wizard createWizard() {
- return new ConnectorProjectWizard();
- }// createWizard
-
- /**
- * shouldAcceptElement - Always true
- *
- * @param Object
- * obj
- */
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }// shouldAcceptElement
-
- protected String getDialogText() {
- return null;
- }
-}// NewConnectorProjectAction
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java
deleted file mode 100644
index 61a7967..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java
+++ /dev/null
@@ -1,64 +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.jst.j2ee.jca.ui.internal.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class RARArchiveUIResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("rararchiveui");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
deleted file mode 100644
index 083a42d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Nov 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class JCAUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.jca.ui"; //$NON-NLS-1$
-
-
- // The shared instance.
- private static JCAUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public JCAUIPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JCAUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java
deleted file mode 100644
index 9d747f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.jca.ui.internal.util;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class JCAUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "jca_ui";//$NON-NLS-1$
-
- private JCAUIMessages() {
- // Do not instantiate
- }
-
- public static String connector_export_action_label_ui_;
- public static String _9;
- public static String _8;
- public static String _7;
- public static String _6;
- public static String _5;
- public static String _4;
- public static String _3;
- public static String _2;
- public static String _10;
- public static String _1;
- public static String _0;
- public static String _11;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JCAUIMessages.class);
- }
-
- public static final String IMAGE_LOAD_ERROR = _0;
- public static final String JCA_MODULE_WIZ_TITLE = _1;
- public static final String JCA_VERSION_LBL = _2;
- public static final String JCA_MODULE_MAIN_PG_TITLE = _3;
- public static final String JCA_MODULE_MAIN_PG_DESC = _4;
- public static final String JCA_IMPORT_MAIN_PG_DESC = _5;
- public static final String JCA_IMPORT_MAIN_PG_TITLE = _6;
- public static final String JCA_FILE_LBL = _7;
- public static final String JCA_MODULE_LBL = _8;
- public static final String JCA_EXPORT_MAIN_PG_TITLE = _9;
- public static final String JCA_EXPORT_MAIN_PG_DESC = _10;
- public static final String JCA_FACET_CONFIGURATION= _11;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizard.java
deleted file mode 100644
index a80d9c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizard.java
+++ /dev/null
@@ -1,89 +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.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizard;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to create J2EE Connector module structures in Eclipse Projects.
- * </p>
- */
-public final class ConnectorComponentCreationWizard extends J2EEComponentCreationWizard implements IExecutableExtension, INewWizard {
-
- /**
- * <p>
- * The Wizard ID of the ConnectorModuleCreationWizard. Used for internal purposes and activities management.
- * </p>
- */
- public static final String WIZARD_ID = ConnectorComponentCreationWizard.class.getName();
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public ConnectorComponentCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public ConnectorComponentCreationWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default page image.
- * </p>
- *
- * @see J2EEArtifactCreationWizard#doInit()
- */
- protected void doInit() {
- setWindowTitle(JCAUIMessages.JCA_MODULE_WIZ_TITLE);
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_PROJECT_WIZARD_BANNER));
- preFillSelectedEARProject();
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Adds a {@link ConnectorComponentCreationWizardPage} as the {@link J2EEComponentCreationWizard#MAIN_PG}.
- * </p>
- */
- public void doAddPages() {
- addPage(new ConnectorComponentCreationWizardPage(getDataModel(), MAIN_PG));
- super.doAddPages();
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new ConnectorComponentCreationDataModelProvider();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizardPage.java
deleted file mode 100644
index f095b8e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizardPage.java
+++ /dev/null
@@ -1,58 +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.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizardPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentCreationWizardPage extends J2EEComponentCreationWizardPage {
-
- /**
- * @param model
- * @param pageName
- */
- public ConnectorComponentCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(JCAUIMessages.JCA_MODULE_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_MODULE_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_PROJECT_WIZARD_BANNER));
- }
-
- protected String getVersionLabel() {
- return JCAUIMessages.JCA_VERSION_LBL;
- }
-
- protected String[] getValidationPropertyNames() {
- return super.getValidationPropertyNames();
- }
-
- /**
- *
- */
- protected String getInfopopID() {
- return IJ2EEUIContextIds.NEW_CONNECTOR_WIZARD_P1;
- }
-
- protected void addToAdvancedComposite(Composite advanced) {
- super.addToAdvancedComposite(advanced);
- super.createSourceFolderComposite(advanced);
- }
-// protected void addToAdvancedComposite(Composite advanced) {
-//// super.addToAdvancedComposite(advanced);
-//// createAnnotationsGroup(advanced);
-// super.createMultipleModulesComposite(advanced);
-// }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java
deleted file mode 100644
index ef2ea40..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java
+++ /dev/null
@@ -1,77 +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.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Connector module structures
- * from the Eclipse Workbench to a deployable Connector
- * Archive *.rar file.
- * </p>
- */
-public final class ConnectorComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public ConnectorComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public ConnectorComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new ConnectorComponentExportDataModelProvider();
- }
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li> {@link RARExportPage} as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- public void doAddPages() {
- addPage(new RARExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_EXPORT_WIZARD_BANNER));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java
deleted file mode 100644
index b420d10..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java
+++ /dev/null
@@ -1,53 +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.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentImportPage extends J2EEModuleImportPage {
-
- public ConnectorComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(JCAUIMessages.JCA_IMPORT_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_IMPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_IMPORT_WIZARD_BANNER));
- }
-
- protected String getFileImportLabel() {
- return JCAUIMessages.JCA_FILE_LBL;
- }
-
- protected String[] getFilterExpression() {
- return new String[]{"*.rar"}; //$NON-NLS-1$
- }
-
- protected String getFileNamesStoreID() {
- return "RAR";//$NON-NLS-1$
- }
-
- protected String getProjectImportLabel() {
- return JCAUIMessages.JCA_MODULE_LBL;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- return super.createTopLevelComposite(parent);
- }
-
- protected String getInfopopID() {
- return IJ2EEUIContextIds.IMPORT_RAR_WIZARD_PAGE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java
deleted file mode 100644
index 56b55ab..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java
+++ /dev/null
@@ -1,82 +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.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to import J2EE Connector module structures into the Eclipse Workbench from an
- * existing Connector *.rar file.
- * </p>
- */
-public final class ConnectorComponentImportWizard extends J2EEComponentImportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public ConnectorComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public ConnectorComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds an {@link RARImportPage} as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- public void doAddPages() {
- addPage(new ConnectorComponentImportPage(getDataModel(), MAIN_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_IMPORT_WIZARD_BANNER));
- // updateEARToModelFromSelection(getSpecificDataModel());
- }
-
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.internal.jca.validation.UIConnectorValidator"}; //$NON-NLS-1$
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new ConnectorComponentImportDataModelProvider();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java
deleted file mode 100644
index 16cc3ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.jca.project.facet.IConnectorFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-public class ConnectorFacetInstallPage extends J2EEModuleFacetInstallPage implements IConnectorFacetInstallDataModelProperties {
-
- private Label configFolderLabel;
- private Text configFolder;
-
- public ConnectorFacetInstallPage() {
- super(IModuleConstants.JST_CONNECTOR_MODULE);
- setTitle(JCAUIMessages.JCA_MODULE_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_FACET_CONFIGURATION);
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME, CONFIG_FOLDER};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.NEW_CONNECTOR_WIZARD_P3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- //setupEarControl(composite);
-
- configFolderLabel = new Label(composite, SWT.NONE);
- configFolderLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.SOURCEFOLDER));
- configFolderLabel.setLayoutData(gdhfill());
-
- configFolder = new Text(composite, SWT.BORDER);
- configFolder.setLayoutData(gdhfill());
- configFolder.setData("label", configFolderLabel); //$NON-NLS-1$
- synchHelper.synchText(configFolder, CONFIG_FOLDER, null);
-
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
deleted file mode 100644
index 16e4f39..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public ConnectorProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(JCAUIMessages.JCA_MODULE_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_MODULE_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_PROJECT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.NEW_CONNECTOR_WIZARD_P1);
- }
-
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.JCA;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java
deleted file mode 100644
index 9945476..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.ui.internal.wizard;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-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.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class ConnectorProjectWizard extends NewProjectDataModelFacetWizard {
-
- public ConnectorProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(JCAUIMessages.JCA_MODULE_WIZ_TITLE);
- }
-
- public ConnectorProjectWizard() {
- super();
- setWindowTitle(JCAUIMessages.JCA_MODULE_WIZ_TITLE);
- }
-
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
- }
-
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle(J2EEUIPlugin.PLUGIN_ID);
- final URL url = bundle.getEntry("icons/full/wizban/connector_wiz.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.connector"); //$NON-NLS-1$
- }
-
- protected IWizardPage createFirstPage() {
- return new ConnectorProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
deleted file mode 100644
index 8cd469d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
+++ /dev/null
@@ -1,93 +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
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class RARExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public RARExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(JCAUIMessages.JCA_EXPORT_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_EXPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.JCA_PROJ_LBL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- protected String[] getFilterExpression() {
- return new String[]{"*.rar"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof Connector;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- return super.createTopLevelComposite(parent);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getInfopopID()
- */
- protected String getInfopopID() {
- return IJ2EEUIContextIds.EXPORT_RAR_WIZARD_PAGE;
- }
-
- protected String getCompnentID() {
- return "JST_CONNECTOR"; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties
deleted file mode 100644
index a2d96c6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties
+++ /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
-###############################################################################
-providerName=Eclipse.org
-jca.module_ui_=Connector Module
-new.jca.module.description_ui_=Create a Connector module
-connector.import.description_ui_=Import an external Connector RAR file into a Connector project
-connector.export.description_ui_=Export a Connector project into a Connector RAR file
-connector.jar.file_ui_=RAR file
-connector.module_ui_=Connector Module
-new.connector.module.description_ui_=Create a Connector project
-connector.import.action.label_ui_=Import RAR File...
-connector.export.action.label_ui_=Export RAR File...
-connector_module_ui_=Connector Project
-new.connector.module.description_ui_=Create a J2EE connector project
-connectors.actionSet=J2C
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml
deleted file mode 100644
index f4bcbfc..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!-- ====================================================== -->
-<!-- -->
-<!-- Purpose: Extension for the J2EE ACtion Sets -->
-<!-- Extension point: org.eclipse.ui.actionSets -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%connectors.actionSet"
- description="%connectors.actionSet"
- visible="false"
- id="org.eclipse.jst.j2ee.J2eeMainActionSet4">
- <action
- label="%new.jca.module.description_ui_"
- icon="icons/full/ctool16/newconnectionprj_wiz.gif"
- tooltip="%new.jca.module.description_ui_"
- class="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponentAction"
- toolbarPath="J2EEMain4"
- id="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponent">
- </action>
- </actionSet>
- </extension>
- <!-- Connector Module Wizard -->
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%jca.module_ui_"
- id="org.eclipse.jst.j2ee.jca.ui">
- </category>
- <wizard
- name="%connector_module_ui_"
- icon="icons/full/ctool16/newconnectionprj_wiz.gif"
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <description>
- %new.connector.module.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-<!-- JCA Import Wizard -->
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%connector.jar.file_ui_"
- icon="icons/full/ctool16/import_rar.gif"
- class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard"
- id="org.eclipse.jst.j2ee.jca.ui.ConnectorComponentImportWizard">
- <description>
- %connector.import.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
-<!-- JCA Export Wizard -->
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- name="%connector.jar.file_ui_"
- icon="icons/full/ctool16/export_rar.gif"
- class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard"
- id="org.eclipse.jst.j2ee.jca.ui.ConnectorComponentExportWizard">
- <description>
- %connector.export.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
-<!-- Navigator Object Contributions -->
-<!-- Connector Group Contributions -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.rarNewProjectActions">
- <action
- label="%jca.module_ui_"
- icon="icons/full/ctool16/newconnectionprj_wiz.gif"
- class="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponentAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.new.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponentAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- </visibility>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.rarProjectActions">
- <action
- label="%connector.jar.file_ui_"
- icon="icons/full/ctool16/import_rar.gif"
- class="org.eclipse.jst.j2ee.jca.ui.internal.actions.ImportRARAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.jca.ui.internal.actions.ImportRARAction">
- </action>
- <action
- label="%connector.jar.file_ui_"
- icon="icons/full/ctool16/export_rar.gif"
- class="org.eclipse.jst.j2ee.jca.ui.internal.actions.ExportRARAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.jca.ui.internal.actions.ExportRARAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.navigator.workbench.commonWizard">
- <!-- Connector New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Module">
- </objectClass>
- </or>
- </enablement>
- </commonWizard>
- <!-- Connector import -->
- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.jca.ui.ConnectorModuleImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- </and>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.internal.impl.ApplicationImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.internal.impl.ModuleImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl">
- </objectClass>
-
-
- </or>
- </enablement>
- </commonWizard>
- <!-- Connector Export -->
- <commonWizard
- type="export"
- wizardId="org.eclipse.jst.j2ee.jca.ui.ConnectorModuleExportWizard">
- <enablement>
- <or>
- <and>
- <or>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- </or>
- <or>
- <objectState
- name="sNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard>
- <!-- Import Classes Wizard -->
- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizard">
-
- <wizard-pages facet="jst.connector" version="1.0">
- <install>
- <page class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.connector" version="1.5">
- <install>
- <page class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorFacetInstallPage"/>
- </install>
- </wizard-pages>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties
deleted file mode 100644
index f8ff5fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties
+++ /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
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Connector Project
-_2=J2C version:
-_3=Connector Project
-_4=Create a standalone Connector module or add it to a new or existing Enterprise Application project.
-_5=Import a Connector module from the file system
-_6=Connector Import
-_7=Connector file:
-_8=Connector module:
-_9=Connector Export
-_10=Export Connector module to the local file system.
-_11=Configure Connector module settings.
-connector_export_action_label_ui_=Export RAR File...
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.classpath b/plugins/org.eclipse.jst.j2ee.jca/.classpath
deleted file mode 100644
index 87800a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="jca/"/>
- <classpathentry kind="src" path="rarproject/"/>
- <classpathentry kind="src" path="jcaedit/"/>
- <classpathentry kind="src" path="jca-validation/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.cvsignore b/plugins/org.eclipse.jst.j2ee.jca/.cvsignore
deleted file mode 100644
index d369c9a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.project b/plugins/org.eclipse.jst.j2ee.jca/.project
deleted file mode 100644
index 7185aae..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.jca</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
deleted file mode 100644
index ac57d14..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JCA Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.jca; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.j2ee.internal.jca.archive.operations,
- org.eclipse.jst.j2ee.internal.jca.operations,
- org.eclipse.jst.j2ee.internal.jca.providers,
- org.eclipse.jst.j2ee.internal.jca.validation,
- org.eclipse.jst.j2ee.jca.internal.module.util,
- org.eclipse.jst.j2ee.jca.internal.plugin,
- org.eclipse.jst.j2ee.jca.modulecore.util,
- org.eclipse.jst.j2ee.jca.project.facet
-Require-Bundle: org.eclipse.jst.j2ee,
- org.eclipse.jem.workbench,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.core.resources,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jdt.core,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem.workbench,
- org.eclipse.wst.validation,
- org.eclipse.emf.edit,
- org.eclipse.core.runtime,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.modulecore,
- org.eclipse.core.commands,
- org.eclipse.jem.util,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.common.project.facet.core
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.jca/about.html b/plugins/org.eclipse.jst.j2ee.jca/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build.properties b/plugins/org.eclipse.jst.j2ee.jca/build.properties
deleted file mode 100644
index cdbdb39..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build.properties
+++ /dev/null
@@ -1,24 +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
-###############################################################################
-source.. = jca/,\
- rarproject/,\
- jcaedit/,\
- jca-validation/,\
- property_files/
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- .,\
- META-INF/,\
- about.html
-jars.compile.order = .
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties b/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties
deleted file mode 100644
index 3270ed0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-CONTACT=danberg@us.ibm.com
-ComponentShortName=ejb
-ComponentFullName=EJB
-ComponentCompetency=EMF
-JavaCompile.1=srcjar
-BuildVerification.1=dir
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/package.xml b/plugins/org.eclipse.jst.j2ee.jca/build/package.xml
deleted file mode 100644
index 154d2fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/package.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="com.ibm.etools.emf.workbench" default="packagingPlugin" basedir="./..">
- <target name="init">
- <property name="packageDir" value=""/>
- <property name="plugin.directory" value="${basedir}"/>
- <property name="plugin.id" value="com.ibm.etools.ejb"/>
- <property name="plugin.version" value=""/>
- </target>
- <target name="packagingPlugin" depends="init">
- <echo message="${plugin.id}"/>
- <copy todir="${packageDir}/plugins/${plugin.id}_${plugin.version}">
- <fileset dir="${plugin.directory}">
- <include name="plugin.xml"/>
- <include name="runtime/ejb.jar"/>
- </fileset>
- </copy>
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml b/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml
deleted file mode 100644
index 77c0b82..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
- <!ENTITY baseBuild SYSTEM "file:../../wsBuildDef.xml">
-]>
-
-<project name="buildPlugin" default="build" basedir="./..">
-
-<!-- include the common xml build file -->
-&baseBuild;
-
-<target name="build" depends="prepare" if="plugin.id">
- <antcall target="buildjar">
- <param name="jarname" value="${defaultjarname}"/>
- <param name="jarclasspath" value="${plugin.classpath}"/>
- </antcall>
-</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/component.xml b/plugins/org.eclipse.jst.j2ee.jca/component.xml
deleted file mode 100644
index 073e1d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/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.jst.j2ee.jca"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.jca" fragment="false"/><plugin id="org.eclipse.jst.j2ee.jca.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif
deleted file mode 100644
index 06f1433..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif
deleted file mode 100644
index 2987b60..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif
deleted file mode 100644
index 2b2b1ed..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif
deleted file mode 100644
index e67f4f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif
deleted file mode 100644
index 867e052..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif
deleted file mode 100644
index 42fdffa..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif
deleted file mode 100644
index 927efe4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif
deleted file mode 100644
index 2dff485..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif
deleted file mode 100644
index 98bbc52..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index a1338ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 5e33d45..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index 1b51ca0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 2730bbf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index bae88bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif
deleted file mode 100644
index 6c01e2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif
deleted file mode 100644
index db7eee0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif
deleted file mode 100644
index b8d1884..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif
deleted file mode 100644
index ae50504..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif
deleted file mode 100644
index acf3043..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
deleted file mode 100644
index 3c4caa5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif
deleted file mode 100644
index f3d6138..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif
deleted file mode 100644
index db7eee0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif
deleted file mode 100644
index b8d1884..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif
deleted file mode 100644
index eb192b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
deleted file mode 100644
index 28e4676..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif
deleted file mode 100644
index 46a149b..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif
deleted file mode 100644
index 3857de1..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif
deleted file mode 100644
index 204a12c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif
deleted file mode 100644
index ce94aff..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif
deleted file mode 100644
index ba25bed..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif
deleted file mode 100644
index 7828f47..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif
deleted file mode 100644
index 739ebbf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif
deleted file mode 100644
index b3643da..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif
deleted file mode 100644
index 106881e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif
deleted file mode 100644
index 48e3cf2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif
deleted file mode 100644
index be22463..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif
deleted file mode 100644
index ed87474..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif
deleted file mode 100644
index 338fb8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif
deleted file mode 100644
index c414fe9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif
deleted file mode 100644
index 134551b..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif
deleted file mode 100644
index be22463..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif
deleted file mode 100644
index afb82ea..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif
deleted file mode 100644
index c414fe9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif
deleted file mode 100644
index 2124f3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif
deleted file mode 100644
index 136e3b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif
deleted file mode 100644
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java b/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java
deleted file mode 100644
index f84b25c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java
+++ /dev/null
@@ -1,82 +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
- *******************************************************************************/
-/*
- * Created on Jan 22, 2004
- *
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.jca.validation;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.validation.J2EEValidationHelper;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.model.internal.validation.ConnectorMessageConstants;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ConnectorHelper extends J2EEValidationHelper {
- protected RARFile rarFile;
-
- /**
- *
- */
- public ConnectorHelper() {
- super();
- registerModel(ConnectorMessageConstants.CONNECTOR_MODEL_NAME, "loadRarFile"); //$NON-NLS-1$
- }
-
- /**
- * Get the Rar file for validation
- */
- public EObject loadRarFile() {
-
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- Archive archive = ((ConnectorArtifactEdit) edit).asArchive(false);
- return archive;
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- return null;
- }
- /**
- * Given a resource, return its non-eclipse-specific location. If this resource, or type of
- * resource, isn't handled by this helper, return null.
- */
- public String getPortableName(IResource resource) {
- if (!(resource instanceof IFile)) {
- return null;
- }
- return "rar.xml"; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java b/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java
deleted file mode 100644
index 3ba7264..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java
+++ /dev/null
@@ -1,84 +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
- *******************************************************************************/
-/*
- * Created on Jan 22, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.jca.validation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.ConnectorValidator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class UIConnectorValidator extends ConnectorValidator {
- /**
- *
- */
- public UIConnectorValidator() {
- super();
- }
-
- /**
- * Does the validation.
- */
- public void validate(IValidationContext inHelper, IReporter inReporter) throws org.eclipse.wst.validation.internal.core.ValidationException {
-
- IProject proj = ((IWorkbenchContext) inHelper).getProject();
- IVirtualComponent wbModule = ComponentCore.createComponent(proj);
-
- if(J2EEProjectUtilities.isJCAProject(proj)) {
- IVirtualFile rarDD = wbModule.getRootFolder().getFile(J2EEConstants.RAR_DD_URI);
- if( rarDD.exists()) {
- super.validate(inHelper, inReporter);
- }
- //validateJ2EE14DocType(helper, editModel);
- }
- }
-
-
- /**
- * Checks if the nature is consistent with doc type.
- */
-// protected void validateJ2EE14DocType(ConnectorHelper helper, ConnectorEditModel editModel) {
-//
-// if (editModel.getConnectorNature().getJ2EEVersion() == J2EEVersionConstants.J2EE_1_4_ID && getConnectorDD().getVersionID() < J2EEVersionConstants.JCA_1_5_ID) {
-// String[] params = new String[3];
-// params[0] = DOCTYPE_1_4;
-// params[1] = helper.getProject().getName();
-// params[2] = DOCTYPE_1_3;
-// addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-// } else if (editModel.getConnectorNature().getJ2EEVersion() == J2EEVersionConstants.J2EE_1_3_ID && getConnectorDD().getVersionID() != J2EEVersionConstants.JCA_1_0_ID) {
-// String[] params = new String[3];
-// params[0] = DOCTYPE_1_3;
-// params[1] = helper.getProject().getName();
-// params[2] = DOCTYPE_1_4;
-// addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-// }// if
-// }// validateDocTypeVsNature
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java
deleted file mode 100644
index 98429cf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java
+++ /dev/null
@@ -1,39 +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.jst.j2ee.jca.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class JCAResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "rar";//$NON-NLS-1$
-
- private JCAResourceHandler() {
- // Do not instantiate
- }
-
- public static String LicenseItemProvider_UI_0;
- public static String SecurityPermissionItemProvider_UI_0;
- public static String ConfigPropertyItemProvider_UI_0;
- public static String _UI_ResourceAdapter_type;
- public static String _UI_OutboundResourceAdapter_type;
- public static String _UI_ConnectionDefinition_type;
- public static String _UI_InboundResourceAdapter_type;
- public static String _UI_MessageAdapter_type;
- public static String _UI_MessageListener_type;
- public static String _UI_ActivationSpec_type;
- public static String _UI_RequiredConfigPropertyType_type;
- public static String _UI_AdminObject_type;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JCAResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java
deleted file mode 100644
index 27df270..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java
+++ /dev/null
@@ -1,75 +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
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.internal.plugin;
-
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class JcaModuleExtensionImpl extends EarModuleExtensionImpl implements JcaModuleExtension {
-
- /**
- *
- */
- public JcaModuleExtensionImpl() {
- super();
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.JcaModuleExtension#createProjectInfo()
- */
- // public J2EEJavaProjectInfo createProjectInfo() {
- // return new ConnectorProjectInfo();
- // }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.JcaModuleExtension#createImportOperation(org.eclipse.core.resources.IProject,
- * org.eclipse.jst.j2ee.internal.internal.commonarchivecore.RARFile)
- */
- // public J2EEImportOperation createImportOperation(IProject proj, RARFile rarFile){
- // return new RARImportOperation(proj, rarFile);
- // }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectDataModel()
- */
- public IDataModel createProjectDataModel() {
- return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createImportDataModel()
- */
- public IDataModel createImportDataModel() {
- return DataModelFactory.createDataModel(new ConnectorComponentImportDataModelProvider());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java
deleted file mode 100644
index c92e99b..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java
+++ /dev/null
@@ -1,163 +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.jst.j2ee.jca.internal.plugin;
-
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- *
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-
-public class JcaPlugin extends WTPPlugin implements ResourceLocator {
- // Default instance of the receiver
- private static JcaPlugin inst;
- protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.jca"; //$NON-NLS-1$
- // Validation part of the plugin
- //Global ResourceSet (somewhat global)
-
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/cview16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/clcl16", //$NON-NLS-1$
- "icons/full/ovr16", //$NON-NLS-1$
- "icons/full/extra", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- /**
- * Create the J2EE plugin and cache its default instance
- */
- public JcaPlugin() {
- super();
- if (inst == null)
- inst = this;
- }
-
-
- /**
- * Get the plugin singleton.
- */
- static public JcaPlugin getDefault() {
- return inst;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public URL getBaseURL() {
- return getBundle().getEntry("/");
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public Object getImage(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/");
- }
-
- /**
- * Get the singleton instance.
- */
- public static JcaPlugin getPlugin() {
- return inst;
- }
-
- /**
- * Return the plugin directory location- the directory that all the plugins are located in (i.e.
- * d:\installdir\plugin)
- */
- public static IPath getPluginLocation(String pluginId) {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null) {
- try {
- IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator();
- String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
- return new Path(installStr);
- } catch (IOException e) {
- //Ignore
- }
- }
- return null;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key) {
- try {
- return getDescriptor().getResourceBundle().getString(key);
- } catch (MissingResourceException ex) {
- //TODO Don't throw error - just show unresolved key
- //Logger.getLogger().logError(ex);
- return '!' + key + '!';
- }
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key, Object[] substitutions) {
- return MessageFormat.format(getString(key), substitutions);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- ConnectorResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
deleted file mode 100644
index b5a413d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.project.facet;
-
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class ConnectorFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IConnectorFacetInstallDataModelProperties {
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(FACET_ID)) {
- return J2EEProjectUtilities.JCA;
- } else if (propertyName.equals(CONFIG_FOLDER))
- return CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER;
- else if (propertyName.equals(MODULE_URI)) {
- String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- return projectName + IJ2EEModuleConstants.RAR_EXT;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(version.getVersionString());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
deleted file mode 100644
index cfcf965..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.project.facet;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-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.emf.ecore.EPackage;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationOp;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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.IFacetedProject;
-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.IRuntime;
-
-public class ConnectorFacetInstallDelegate extends J2EEFacetInstallDelegate 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;
-
- final IJavaProject jproj = JavaCore.create(project);
-
- // Add WTP natures.
-
- WtpUtils.addNatures(project);
-
- // Create the directory structure.
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
-
- // Setup the flexible project structure.
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
-
- c.create(0, null);
- c.setMetaProperty("java-output-path", "/build/classes/"); //$NON-NLS-1$ //$NON-NLS-2$
-
- final IVirtualFolder root = c.getRootFolder();
- IFolder sourceFolder = null;
- String configFolder = null;
- configFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- root.createLink(new Path("/" + configFolder), 0, null); //$NON-NLS-1$
- String configFolderName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- IPath configFolderpath = pjpath.append(configFolderName);
- sourceFolder = ws.getRoot().getFolder(configFolderpath);
-
- if (!sourceFolder.getFile(J2EEConstants.RAR_DD_URI).exists()) {
- String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
- ConnectorArtifactEdit.createDeploymentDescriptor(project, nVer);
- }
-
- // add source folder maps
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- root.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
- }
- }
-
- IVirtualFile vf = c.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
- if (manifestmf == null || !manifestmf.exists()) {
- try {
- createManifest(project, c.getRootFolder().getUnderlyingFolder(), monitor);
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- } catch (InterruptedException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- // Setup the classpath.
- ClasspathHelper.removeClasspathEntries(project, fv);
-
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- // Associate with an EAR, if necessary.
-
- final String earProjectName = (String) model.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)) {
- if (earProjectName != null && !earProjectName.equals("")) { //$NON-NLS-1$
-
- String ver = fv.getVersionString();
- String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString
- (J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(ver));
-
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- installEARFacet(j2eeVersionText, earProjectName, (IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME), monitor);
-
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider() {
- public Object getDefaultProperty(String propertyName) {
- if (IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
- Map map = new HashMap();
- map.put(c, moduleURI);
- return map;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new AddComponentToEnterpriseApplicationOp(model) {
- protected Module createNewModule(IVirtualComponent wc) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createConnectorModule();
- }
- };
- }
- });
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(c);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 62fa296..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.project.facet;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-public class ConnectorFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
- public ConnectorFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- map.add(javaFacet);
- IDataModel jcaFacet = DataModelFactory.createDataModel(new ConnectorFacetInstallDataModelProvider());
- map.add(jcaFacet);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME,jcaFacet.getStringProperty(IConnectorFacetInstallDataModelProperties.CONFIG_FOLDER));
-
- jcaFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
- setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
- }else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_EAR, event.getProperty());
- }
- }
- });
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java
deleted file mode 100644
index fbdf2ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-public interface IConnectorFacetInstallDataModelProperties
- extends IJ2EEModuleFacetInstallDataModelProperties{
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java
deleted file mode 100644
index dd7b376..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java
+++ /dev/null
@@ -1,50 +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.jst.j2ee.internal.jca.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentExportOperation extends J2EEArtifactExportOperation {
-
- public ConnectorComponentExportOperation() {
- super();
- }
-
- public ConnectorComponentExportOperation(IDataModel model) {
- super(model);
- }
-
- protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
- try {
- CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
- ConnectorComponentLoadStrategyImpl ls = new ConnectorComponentLoadStrategyImpl(getComponent());
- ls.setExportSource(isExportSource());
- setModuleFile(caf.openRARFile(ls, getDestinationPath().toOSString()));
- getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
- } catch (Exception e) {
- throw new SaveFailureException(J2EEPluginResourceHandler.Error_opening_archive_for_export_2, e);//$NON-NLS-1$
- }
- }
-
- protected String archiveString() {
- //TODO fill in string
- return "";
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java
deleted file mode 100644
index d9de651..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,287 +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.jst.j2ee.internal.jca.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ConnectorComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
- private int dotJavaLength = ArchiveUtil.DOT_JAVA.length();
- private List alreadyIndexed = new ArrayList();
- private Map classesMap;
- private IFile knownDD;
-
- public static String[] knownLibExtensions = {".jar", //$NON-NLS-1$
- ".zip", //$NON-NLS-1$
- ".so", //$NON-NLS-1$
- ".o", //$NON-NLS-1$
- ".sl", //$NON-NLS-1$
- ".dll", //$NON-NLS-1$
- }; //$NON-NLS-1$
-
- public ConnectorComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- knownDD = vComponent.getRootFolder().getFile(J2EEConstants.RAR_DD_URI).getUnderlyingFile();
- }
-
- public List getFiles() {
- Collection nestedJars = getNestedJARsFromSourceRoots();
- Iterator interator = nestedJars.iterator();
- while (interator.hasNext()) {
- filesHolder.addFile((File) interator.next());
- }
- aggregateSourceFiles();
- return filesHolder.getFiles();
- }
-
- private Collection getNestedJARsFromSourceRoots() {
- List nestedJars = new ArrayList();
- IPackageFragmentRoot[] sourceRoots = J2EEProjectUtilities.getSourceContainers(vComponent.getProject());
- for (int i = 0; i < sourceRoots.length; i++) {
- File aFile;
- try {
- aFile = getNestedJar(sourceRoots[i]);
- if (null != aFile) {
- nestedJars.add(aFile);
- }
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- return nestedJars;
- }
-
-
-
- private File getNestedJar(IPackageFragmentRoot sourceRoot) throws JavaModelException {
- IPath outputPath = sourceRoot.getRawClasspathEntry().getOutputLocation();
- if (outputPath == null) {
- IProject project = vComponent.getProject();
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
- outputPath = javaProject.getOutputLocation();
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- if (outputPath == null) {
- return null;
- }
- }
-
- IFolder javaOutputFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(outputPath);
- indexClassesForOutputFolder(javaOutputFolder);
- IContainer sourceContainer = (IContainer) sourceRoot.getResource();
-
- int sourceContainerSegmentCount = sourceContainer.getProjectRelativePath().segmentCount();
- boolean isModuleRoot = knownDD.getProjectRelativePath().toString().startsWith(sourceContainer.getProjectRelativePath().toString());
- List iFiles = new ArrayList();
- boolean foundJava = gatherFilesForJAR(iFiles, sourceContainer, isModuleRoot, false, sourceContainerSegmentCount);
- if (!isModuleRoot || foundJava) {
- for (int i = 0; i < iFiles.size(); i++) {
- filesHolder.removeIFile((IFile) iFiles.get(i));
- }
- File nestedArchive = createNestedArchive(iFiles, sourceContainer, javaOutputFolder);
- return nestedArchive;
- }
- return null;
- }
-
- private boolean gatherFilesForJAR(List iFiles, IContainer current, boolean isModuleRoot, boolean foundJava, int sourceContainerSegmentCount) {
- IResource[] members;
- try {
- members = current.members();
- } catch (CoreException core) {
- throw new ArchiveRuntimeException(core);
- }
- for (int i = 0; i < members.length; i++) {
- IResource res = members[i];
- if (res.getType() == IResource.FOLDER) {
- foundJava = gatherFilesForJAR(iFiles, (IFolder) res, isModuleRoot, foundJava, sourceContainerSegmentCount) || foundJava;
- } else {// it must be a file
- IFile srcFile = (IFile) res;
- if (belongsInNestedJAR(srcFile, isModuleRoot)) {
- if (isJava(srcFile)) {
- if (exportSource) {
- iFiles.add(srcFile);
- }
- String className = srcFile.getProjectRelativePath().removeFirstSegments(sourceContainerSegmentCount).toString();
- className = className.substring(0, className.length() - dotJavaLength);
- List classes = retrieveClasses(className);
- if (null != classes) {
- Iterator iterator = classes.iterator();
- while (iterator.hasNext()) {
- IFile clazz = (IFile) iterator.next();
- iFiles.add(clazz);
- }
- }
- } else {
- iFiles.add(srcFile);
- }
- if (isModuleRoot)
- foundJava = foundJava || isJava(srcFile) || isClass(srcFile);
- }
- }
- }
- return foundJava;
- }
-
- private File createNestedArchive(List files, IContainer sourceContainer, IFolder javaOutputFolder) {
- ConnectorComponentNestedJARLoadStrategyImpl loader = new ConnectorComponentNestedJARLoadStrategyImpl(files, sourceContainer, javaOutputFolder);
- ArchiveOptions options = ((Archive) getContainer()).getOptions().cloneWith(loader);
- String uri = computeUniqueArchiveURI(sourceContainer);
- try {
- return getArchiveFactory().primOpenArchive(options, uri);
- } catch (OpenFailureException ex) {
- throw new ArchiveRuntimeException(ex);
- }
- }
-
- private String computeUniqueArchiveURI(IResource resource) {
- int increment = 0;
- String name = resource.getName();
- StringBuffer sb = null;
- do {
- sb = new StringBuffer(name.length() + 5);
- sb.append('_');
- sb.append(name);
- if (increment > 0)
- sb.append(increment);
- sb.append(".jar"); //$NON-NLS-1$
- increment++;
- } while (filesHolder.contains(sb.toString()));
- return sb.toString();
- }
-
- private boolean belongsInNestedJAR(IFile iFile, boolean isModuleRoot) {
- if (isModuleRoot && isDeploymentDescriptor(iFile)) {
- return false;
- }
- for (int i = 0; i < knownLibExtensions.length; i++) {
- if (hasExtension(iFile, knownLibExtensions[i]))
- return false;
- }
- return true;
- }
-
- protected boolean shouldInclude(String uri) {
- return !hasExtension(uri, ArchiveUtil.DOT_CLASS) && !hasExtension(uri, ArchiveUtil.DOT_JAVA);
- }
-
- /**
- * Find all the .class files and index them so inner classes can be located.
- */
- private void indexClassesForOutputFolder(IFolder javaOutputFolder) {
- if (null == javaOutputFolder || alreadyIndexed.contains(javaOutputFolder)) {
- return;
- }
- alreadyIndexed.add(javaOutputFolder);
- int segmentCount = javaOutputFolder.getProjectRelativePath().segmentCount();
- indexClasses(javaOutputFolder, segmentCount);
- }
-
- private void indexClasses(IResource resource, int javaOutputSegmentCount) {
- switch (resource.getType()) {
- case IResource.FILE :
- indexClass((IFile) resource, javaOutputSegmentCount);
- break;
- case IResource.FOLDER :
- try {
- IResource[] members = ((IFolder) resource).members();
- for (int i = 0; i < members.length; i++) {
- indexClasses(members[i], javaOutputSegmentCount);
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- break;
- }
- }
-
- private void indexClass(IFile iFile, int javaOutputSegmentCount) {
- if (!isClass(iFile))
- return;
- if (classesMap == null)
- classesMap = new HashMap();
- String name = iFile.getName();
- IPath relPath = iFile.getProjectRelativePath().removeFirstSegments(javaOutputSegmentCount);
- String key = relPath.toString();
- if (name.indexOf('$') != -1) {
- key = key.substring(0, key.indexOf('$'));
- } else {
- key = key.substring(0, key.indexOf('.'));
- }
- List inners = (List) classesMap.get(key);
- if (inners == null) {
- inners = new ArrayList(1);
- classesMap.put(key, inners);
- }
- inners.add(iFile);
- }
-
- public List retrieveClasses(String key) {
- if (classesMap == null)
- return null;
- return (List) classesMap.get(key);
- }
-
- public static boolean isJava(IFile iFile) {
- return hasExtension(iFile, ArchiveUtil.DOT_JAVA);
- }
-
- public static boolean isClass(IFile iFile) {
- return hasExtension(iFile, ArchiveUtil.DOT_CLASS);
- }
-
- private static boolean hasExtension(IFile iFile, String ext) {
- String name = iFile.getName();
- return hasExtension(name, ext);
- }
-
- private static boolean hasExtension(String name, String ext) {
- int offset = ext.length();
- return name.regionMatches(true, name.length() - offset, ext, 0, offset);
- }
-
- private boolean isDeploymentDescriptor(IFile iFile) {
- return knownDD.equals(iFile);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java
deleted file mode 100644
index fd4450a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java
+++ /dev/null
@@ -1,115 +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.jst.j2ee.internal.jca.archive.operations;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategyImpl;
-
-
-public class ConnectorComponentNestedJARLoadStrategyImpl extends LoadStrategyImpl {
-
- private List files;
- private int sourceSegmentCount;
- private int outputSegmentCount;
- private Map urisToIFiles;
-
- /**
- * Constructor for NestedJARLoadStrategyImpl.
- */
- public ConnectorComponentNestedJARLoadStrategyImpl(List files, IContainer sourceContainer, IFolder javaOutputFolder) {
- super();
- this.files = files;
- sourceSegmentCount = sourceContainer.getProjectRelativePath().segmentCount();
- outputSegmentCount = javaOutputFolder.getProjectRelativePath().segmentCount();
- }
-
- /**
- * @see com.ibm.etools.archive.impl.LoadStrategyImpl#primContains(String)
- */
- protected boolean primContains(String uri) {
- // Should only be used by discriminators, and we don't discriminate these archives
- return true;
- }
-
- /**
- * @see com.ibm.etools.archive.impl.LoadStrategyImpl#getFiles()
- */
- public List getFiles() {
- urisToIFiles = new HashMap();
- List result = new ArrayList();
- int size = files.size();
- for (int i = 0; i < size; i++) {
- IFile iFile = (IFile) files.get(i);
- IPath relPath;
- if(ConnectorComponentLoadStrategyImpl.isClass(iFile)){
- relPath = getRelativePath(iFile, outputSegmentCount);
- } else {
- relPath = getRelativePath(iFile, sourceSegmentCount);
- }
- addFile(iFile, relPath, result);
- }
- return result;
- }
-
- protected void addFile(IFile iFile, IPath relPath, List result) {
- File cFile = createFile(iFile, relPath);
- result.add(cFile);
- urisToIFiles.put(cFile.getURI(), iFile);
- }
-
- protected long getLastModified(IResource aResource) {
- return aResource.getLocation().toFile().lastModified();
- }
-
- private File createFile(IFile iFile, IPath relPath) {
- File cFile = createFile(relPath.toString());
- cFile.setLastModified(getLastModified(iFile));
- return cFile;
- }
-
- private IPath getRelativePath(IFile file, int parentSegmentCount) {
- return file.getProjectRelativePath().removeFirstSegments(parentSegmentCount);
- }
-
- /**
- * @see com.ibm.etools.archive.LoadStrategy#getInputStream(String)
- */
- public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
- if (null == urisToIFiles) {
- getFiles();
- }
- IFile file = (IFile) urisToIFiles.get(uri);
- if (file != null) {
- try {
- return file.getContents();
- } catch (CoreException core) {
- throw new ArchiveRuntimeException(uri, core);
- }
- }
- throw new FileNotFoundException(uri);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
deleted file mode 100644
index 3d81758..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
+++ /dev/null
@@ -1,156 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.ActivationSpec}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ActivationSpecItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ActivationSpecItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addActivationSpecClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Activation Spec Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addActivationSpecClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ActivationSpec_activationSpecClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ActivationSpec_activationSpecClass_feature", "_UI_ActivationSpec_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getActivationSpec_ActivationSpecClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getActivationSpec_RequiredConfigProperties());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns ActivationSpec.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ActivationSpec"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ActivationSpec) object).getActivationSpecClass();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_ActivationSpec_type :
- JCAResourceHandler._UI_ActivationSpec_type + " " + label;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ActivationSpec.class)) {
- case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS :
- case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getActivationSpec_RequiredConfigProperties(), JcaFactory.eINSTANCE.createRequiredConfigPropertyType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
deleted file mode 100644
index 166aace..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
+++ /dev/null
@@ -1,170 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.AdminObject}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class AdminObjectItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public AdminObjectItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addAdminObjectInterfacePropertyDescriptor(object);
- addAdminObjectClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Admin Object Interface feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAdminObjectInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AdminObject_adminObjectInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AdminObject_adminObjectInterface_feature", "_UI_AdminObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAdminObject_AdminObjectInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Admin Object Class feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAdminObjectClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AdminObject_adminObjectClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AdminObject_adminObjectClass_feature", "_UI_AdminObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAdminObject_AdminObjectClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getAdminObject_ConfigProperties());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns AdminObject.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/AdminObject"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((AdminObject) object).getAdminObjectInterface();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_AdminObject_type :
- JCAResourceHandler._UI_AdminObject_type + " " + label;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(AdminObject.class)) {
- case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE :
- case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS :
- case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAdminObject_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
deleted file mode 100644
index 1086314..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
+++ /dev/null
@@ -1,285 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for the AuthenticationMechanism for connector proejcts.
- */
-public class AuthenticationMechanismItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - Adapter factory to create.
- */
- public AuthenticationMechanismItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// AuthenticationMechanismItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addAuthenticationMechanismPropertyDescriptor(object);
- addAuthenticationMechanismTypePropertyDescriptor(object);
- addCredentialInterfacePropertyDescriptor(object);
- addCustomAuthMechTypePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_description_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Authentication Mechanism feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAuthenticationMechanismPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_authenticationMechanism_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_authenticationMechanism_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_AuthenticationMechanism(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Authentication Mechanism Type feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAuthenticationMechanismTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_authenticationMechanismType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_authenticationMechanismType_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_AuthenticationMechanismType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Credential Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addCredentialInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_credentialInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_credentialInterface_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_CredentialInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Custom Auth Mech Type feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addCustomAuthMechTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_customAuthMechType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_customAuthMechType_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_CustomAuthMechType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * AuthenticationMechanism f_authenticationMechanism = ((AuthenticationMechanism)object);
- * JcaPackage pkg = JcaPackage.eINSTANCE;; // This is for the description feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the authentication mechanism",
- * pkg.getAuthenticationMechanism_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the authenticationMechanismType
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Authentication
- * Mechanism Type", "The authentication mechanism type property of the authentication
- * mechanism", pkg.getAuthenticationMechanism_AuthenticationMechanismType(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); // This is for the credentialInterface feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Credential Interface",
- * "The credential interface property of the authentication mechanism",
- * pkg.getAuthenticationMechanism_CredentialInterface(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the AuthenticationMechanism.
- *
- * @param Object
- * object - The adapted class.
- * @return Object
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns AuthenticationMechanism.gif.
- *
- * @param Object
- * object - The adapted class.
- * @return Object
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/auth_mechanism_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Returns the display name.
- *
- * @param Object
- * object - The adapted class.
- * @return String
- */
- public String getText(Object object) {
- AuthenticationMechanism authenticationMechanism = ((AuthenticationMechanism) object);
- return "AuthenticationMechanism " + authenticationMechanism.getDescription(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(AuthenticationMechanism.class)) {
- case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION :
- case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM :
- case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE :
- case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE :
- case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE :
- case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getAuthenticationMechanism_Description() || feature == pkg.getAuthenticationMechanism_AuthenticationMechanismType() || feature == pkg.getAuthenticationMechanism_CredentialInterface()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// AuthenticationMechanismItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
deleted file mode 100644
index 97cad08..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
+++ /dev/null
@@ -1,275 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a Config property object.
- */
-public class ConfigPropertyItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - Adapt factory
- */
- public ConfigPropertyItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// ConfigPropertyItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addNamePropertyDescriptor(object);
- addTypePropertyDescriptor(object);
- addValuePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_description_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_name_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_type_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_value_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * ConfigProperty f_configProperty = ((ConfigProperty)object); JcaPackage pkg =
- * JcaPackage.eINSTANCE;; // This is for the description feature. // itemPropertyDescriptors.add
- * (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the config property", pkg.getConfigProperty_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the name feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Name", "The name
- * property of the config property", pkg.getConfigProperty_Name(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the type feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Type", "The type
- * property of the config property", pkg.getConfigProperty_Type(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the value feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Value", "The value
- * property of the config property", pkg.getConfigProperty_Value(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the ConfigProperty.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns ConfigProperty.gif.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/config_prop_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * This returns text base on the object.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- public String getText(Object object) {
- ConfigProperty configProperty = ((ConfigProperty) object);
- if (configProperty.getName() == null)
- return JCAResourceHandler.ConfigPropertyItemProvider_UI_0;
- return "ConfigProperty: " + configProperty.getName(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ConfigProperty.class)) {
- case JcaPackage.CONFIG_PROPERTY__DESCRIPTION :
- case JcaPackage.CONFIG_PROPERTY__NAME :
- case JcaPackage.CONFIG_PROPERTY__TYPE :
- case JcaPackage.CONFIG_PROPERTY__VALUE :
- case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConfigProperty_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConfigProperty_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getConfigProperty_Description() || feature == pkg.getConfigProperty_Name() || feature == pkg.getConfigProperty_Type() || feature == pkg.getConfigProperty_Value()) {
-
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// ConfigPropertyItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
deleted file mode 100644
index 6fd0a4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
+++ /dev/null
@@ -1,214 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.ConnectionDefinition}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ConnectionDefinitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ConnectionDefinitionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addManagedConnectionFactoryClassPropertyDescriptor(object);
- addConnectionFactoryInterfacePropertyDescriptor(object);
- addConnectionFactoryImplClassPropertyDescriptor(object);
- addConnectionInterfacePropertyDescriptor(object);
- addConnectionImplClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Managed Connection Factory Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManagedConnectionFactoryClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_managedConnectionFactoryClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_managedConnectionFactoryClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ManagedConnectionFactoryClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionFactoryInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionFactoryInterface_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionFactoryInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Impl Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionFactoryImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionFactoryImplClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionFactoryImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionInterface_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Impl Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionImplClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getConnectionDefinition_ConfigProperties());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns ConnectionDefinition.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ConnectionDefinition"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
-
-
- public String getText(Object object) {
- String label = ((ConnectionDefinition) object).getManagedConnectionFactoryClass();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_ConnectionDefinition_type :
- JCAResourceHandler._UI_ConnectionDefinition_type + " " + label;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ConnectionDefinition.class)) {
- case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS :
- case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnectionDefinition_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java
deleted file mode 100644
index f280f77..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java
+++ /dev/null
@@ -1,280 +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.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * This is the item provider adpater for a Conenctor projects
- */
-public class ConnectorItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - An adapter factory.
- */
- public ConnectorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// ConnectorItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addVendorNamePropertyDescriptor(object);
- addSpecVersionPropertyDescriptor(object);
- addEisTypePropertyDescriptor(object);
- addVersionPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Vendor Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVendorNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_vendorName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_vendorName_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_VendorName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Spec Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSpecVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_specVersion_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_specVersion_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_SpecVersion(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Eis Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEisTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_eisType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_eisType_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_EisType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_version_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The current property
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) {
- *
- * if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object);
- *
- * Connector f_connector = ((Connector)object); JcaPackage pkg = JcaPackage.eINSTANCE;; // This
- * is for the displayName feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Display Name", "The
- * display name property of the connector", pkg.getConnector_DisplayName(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the description feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the connector", pkg.getConnector_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the smallIcon feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Small Icon", "The
- * small icon property of the connector", pkg.getConnector_SmallIcon(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the largeIcon feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Large Icon", "The
- * large icon property of the connector", pkg.getConnector_LargeIcon(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the vendorName feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Vendor Name", "The
- * vendor name property of the connector", pkg.getConnector_VendorName(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the specVersion feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Spec Version", "The
- * spec version property of the connector", pkg.getConnector_SpecVersion(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the eisType feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Eis Type", "The eis
- * type property of the connector", pkg.getConnector_EisType(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the version feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Version", "The version
- * property of the connector", pkg.getConnector_Version(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the license feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "License", "The license
- * of the connector", pkg.getConnector_License(), false)); // This is for the resourceAdapter
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Resource Adapter",
- * "The resource adapter of the connector", pkg.getConnector_ResourceAdapter(), false)); }
- * return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * Returns a collection of children references.
- *
- * @param Object
- * object - Object to get children references of.
- * @return Colelction
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getConnector_License());
- childrenReferences.add(JcaPackage.eINSTANCE.getConnector_ResourceAdapter());
- }// if
- return childrenReferences;
- }// getChildrenReferences
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the parent of the Connector.
- *
- * @param Object
- * object - Object to return the parent of.
- * @return Object
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns Connector.gif.
- *
- * @param Object -
- * The object to get the image for.
- * @return Object
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/connection_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- public String getText(Object object) {
- Connector connector = ((Connector) object);
- return "Connector " + connector.getDisplayName(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Connector.class)) {
- case JcaPackage.CONNECTOR__VENDOR_NAME :
- case JcaPackage.CONNECTOR__SPEC_VERSION :
- case JcaPackage.CONNECTOR__EIS_TYPE :
- case JcaPackage.CONNECTOR__VERSION :
- case JcaPackage.CONNECTOR__LICENSE :
- case JcaPackage.CONNECTOR__RESOURCE_ADAPTER : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnector_License(), JcaFactory.eINSTANCE.createLicense()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnector_ResourceAdapter(), JcaFactory.eINSTANCE.createResourceAdapter()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
-}// ConenctorItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
deleted file mode 100644
index 4f1310a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,139 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.InboundResourceAdapter}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class InboundResourceAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public InboundResourceAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getInboundResourceAdapter_MessageAdapter());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns InboundResourceAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/InboundResourceAdapter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- return JCAResourceHandler._UI_InboundResourceAdapter_type;
- //return getString("_UI_InboundResourceAdapter_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(InboundResourceAdapter.class)) {
- case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getInboundResourceAdapter_MessageAdapter(), JcaFactory.eINSTANCE.createMessageAdapter()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JcaPlugin.getPlugin();
- //return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java
deleted file mode 100644
index aa87cba..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java
+++ /dev/null
@@ -1,122 +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.jst.j2ee.internal.jca.providers;
-
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaFactoryImpl;
-
-
-/**
- * This is the central singleton for the jca plugin.
- */
-public class JcaEditPlugin extends Plugin {
- /**
- * Keep track of the singleton.
- */
- protected static JcaEditPlugin plugin;
-
- /**
- * Keep track of the jca package.
- */
- protected JcaPackage jcaPackage;
-
- /**
- * Create the instance.
- */
- public JcaEditPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
-
- // Remember the static instance.
- //
- plugin = this;
- }
-
- /**
- * Get the one jca package.
- */
- public JcaPackage getJcaPackage() {
- return jcaPackage;
- }
-
- /**
- * Get the one jca factory.
- */
- public JcaFactory getJcaFactory() {
- return (JcaFactory) jcaPackage.getEFactoryInstance();
- }
-
- /**
- * Do initialization stuff here.
- */
- public void startup() throws CoreException {
- super.startup();
- jcaPackage = JcaFactoryImpl.getPackage();
- }
-
- /**
- * Get the singleton instance.
- */
- public static JcaEditPlugin getPlugin() {
- return plugin;
- }
-
- /**
- * Get a .gif from the icons folder.
- */
- public Object getImage(String key) {
- try {
- return new URL(getDescriptor().getInstallURL(), "icons/" + key + ".gif"); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (MalformedURLException exception) {
- System.out.println("Failed to load image for '" + key + "'"); //$NON-NLS-1$ //$NON-NLS-2$
- exception.printStackTrace();
- }
-
- return null;
- }
-
- /**
- * Get a translated string from the resource bundle.
- */
- public String getString(String key) {
- return getDescriptor().getResourceBundle().getString(key);
- }
-
- /**
- * Get a translated string from the resource bundle, with an object substitution.
- */
- public String getString(String key, Object s1) {
- return MessageFormat.format(getString(key), new Object[]{s1});
- }
-
- /**
- * Get a translated string from the resource bundle, with two object substitutions.
- */
- public String getString(String key, Object s1, Object s2) {
- return MessageFormat.format(getString(key), new Object[]{s1, s2});
- }
-
- /**
- * Get a translated string from the resource bundle, with three object substitutions.
- */
- public String getString(String key, Object s1, Object s2, Object s3) {
- return MessageFormat.format(getString(key), new Object[]{s1, s2, s3});
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java
deleted file mode 100644
index 4e4067f..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java
+++ /dev/null
@@ -1,69 +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.jst.j2ee.internal.jca.providers;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * This extended item provider supports the following commands:
- * <ul>
- * <li>{@link CreateChildCommand}
- * </ul>
- * <p>
- * The commands are implemented uniformly on all our item adapters using this common base class.
- */
-public class JcaItemProviderAdapter extends ItemProviderAdapter {
-
- /**
- * This is the package for the jca model.
- */
- protected static final JcaPackage jcaPackage = (JcaPackage) EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-
- /**
- * This is the factory for the jca model.
- */
- protected static final JcaFactory jcaFactory = jcaPackage.getJcaFactory();
-
- /**
- * This creates an instance from an adapter factory and a domain notifier.
- */
- protected JcaItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// JcaItemProviderAdapter
-
- /**
- * This creates the supported commands.
- *
- * @param Object
- * object - The adapted class.
- * @param EditingDomain -
- * The current editing domain.
- * @param commandClass -
- * The current command class.
- * @param commandParameter -
- * The current commandParameter.
- * @return Command
- */
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }// createCommand
-
-}// JcaItemProviderAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
deleted file mode 100644
index be84515..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,468 +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.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.jca.internal.util.JcaAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class JcaItemProviderAdapterFactory extends JcaAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement IChangeNotifier.
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by isFactoryForType
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance.
- */
- public JcaItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }// JcaItemProviderAdapterFactory
-
- /**
- * This keeps track of the one adapter used for all Connector instances.
- */
- protected ConnectorItemProvider connectorItemProvider;
-
- /**
- * This creates an adapter for a Connector.
- *
- * @return Adapter
- */
- public Adapter createConnectorAdapter() {
- if (connectorItemProvider == null) {
- connectorItemProvider = new ConnectorItemProvider(this);
- }// if
-
- return connectorItemProvider;
- }// createConnectorAdapter
-
- /**
- * This keeps track of the one adapter used for all License instances.
- */
- protected LicenseItemProvider licenseItemProvider;
-
- /**
- * This creates an adapter for a License.
- *
- * @return Adapter
- */
- public Adapter createLicenseAdapter() {
- if (licenseItemProvider == null) {
- licenseItemProvider = new LicenseItemProvider(this);
- }// if
-
- return licenseItemProvider;
- }// createLicenseAdapter
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.InboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected InboundResourceAdapterItemProvider inboundResourceAdapterItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.InboundResourceAdapter}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createInboundResourceAdapterAdapter() {
- if (inboundResourceAdapterItemProvider == null) {
- inboundResourceAdapterItemProvider = new InboundResourceAdapterItemProvider(this);
- }
-
- return inboundResourceAdapterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.OutboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected OutboundResourceAdapterItemProvider outboundResourceAdapterItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.OutboundResourceAdapter}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createOutboundResourceAdapterAdapter() {
- if (outboundResourceAdapterItemProvider == null) {
- outboundResourceAdapterItemProvider = new OutboundResourceAdapterItemProvider(this);
- }
-
- return outboundResourceAdapterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.MessageAdapter}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MessageAdapterItemProvider messageAdapterItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.MessageAdapter}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createMessageAdapterAdapter() {
- if (messageAdapterItemProvider == null) {
- messageAdapterItemProvider = new MessageAdapterItemProvider(this);
- }
-
- return messageAdapterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.ConnectionDefinition}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected ConnectionDefinitionItemProvider connectionDefinitionItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.ConnectionDefinition}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createConnectionDefinitionAdapter() {
- if (connectionDefinitionItemProvider == null) {
- connectionDefinitionItemProvider = new ConnectionDefinitionItemProvider(this);
- }
-
- return connectionDefinitionItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.AdminObject}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected AdminObjectItemProvider adminObjectItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.AdminObject}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createAdminObjectAdapter() {
- if (adminObjectItemProvider == null) {
- adminObjectItemProvider = new AdminObjectItemProvider(this);
- }
-
- return adminObjectItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.MessageListener}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MessageListenerItemProvider messageListenerItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.MessageListener}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createMessageListenerAdapter() {
- if (messageListenerItemProvider == null) {
- messageListenerItemProvider = new MessageListenerItemProvider(this);
- }
-
- return messageListenerItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.ActivationSpec}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ActivationSpecItemProvider activationSpecItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.ActivationSpec}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createActivationSpecAdapter() {
- if (activationSpecItemProvider == null) {
- activationSpecItemProvider = new ActivationSpecItemProvider(this);
- }
-
- return activationSpecItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.RequiredConfigPropertyType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected RequiredConfigPropertyTypeItemProvider requiredConfigPropertyTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.RequiredConfigPropertyType}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createRequiredConfigPropertyTypeAdapter() {
- if (requiredConfigPropertyTypeItemProvider == null) {
- requiredConfigPropertyTypeItemProvider = new RequiredConfigPropertyTypeItemProvider(this);
- }
-
- return requiredConfigPropertyTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all ResourceAdapter instances.
- */
- protected ResourceAdapterItemProvider resourceAdapterItemProvider;
-
- /**
- * This creates an adapter for a ResourceAdapter.
- *
- * @return Adapter
- */
- public Adapter createResourceAdapterAdapter() {
- if (resourceAdapterItemProvider == null) {
- resourceAdapterItemProvider = new ResourceAdapterItemProvider(this);
- }// if
-
- return resourceAdapterItemProvider;
- }// createResourceAdapterAdapter
-
- /**
- * This keeps track of the one adapter used for all SecurityPermission instances.
- */
- protected SecurityPermissionItemProvider securityPermissionItemProvider;
-
- /**
- * This creates an adapter for a SecurityPermission.
- *
- * @return Adapter
- */
- public Adapter createSecurityPermissionAdapter() {
- if (securityPermissionItemProvider == null) {
- securityPermissionItemProvider = new SecurityPermissionItemProvider(this);
- }// if
-
- return securityPermissionItemProvider;
- }// createSecurityPermissionAdapter
-
- /**
- * This keeps track of the one adapter used for all AuthenticationMechanism instances
- */
- protected AuthenticationMechanismItemProvider authenticationMechanismItemProvider;
-
- /**
- * This creates an adapter for a AuthenticationMechanism.
- *
- * @return Adapter
- */
- public Adapter createAuthenticationMechanismAdapter() {
- if (authenticationMechanismItemProvider == null) {
- authenticationMechanismItemProvider = new AuthenticationMechanismItemProvider(this);
- }// if
-
- return authenticationMechanismItemProvider;
- }// createAuthenticationMechanismAdapter
-
- /**
- * This keeps track of the one adapter used for all ConfigProperty instances.
- */
- protected ConfigPropertyItemProvider configPropertyItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.ConfigProperty}.
- */
- public Adapter createConfigPropertyAdapter() {
- if (configPropertyItemProvider == null) {
- configPropertyItemProvider = new ConfigPropertyItemProvider(this);
- }// if
-
- return configPropertyItemProvider;
- }// createConfigPropertyAdapter
-
- /**
- * This returns the root adapter factory that contains this factory.
- *
- * @return ComposeableAdapterFactory
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }// getRootAdapterFactory
-
- /**
- * This sets the composed adapter factory that contains this factory.
- *
- * @return ComposedAdapterFactory
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }// setParentAdapterFactory
-
- /**
- * Checks if it is a factory type
- *
- * @param Object
- * type - The given type
- * @return boolean
- */
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }// isFactoryForType
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- *
- * @param Notifier
- * notifier - The given notifer.
- * @param Object
- * type - The given type
- * @return Adapter
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }// adapt
-
- /**
- * Does adapting.
- *
- * @param Object
- * object - The given object.
- * @param Oject
- * type - The given type.
- * @return Object
- */
- public Object adapt(Object object, Object type) {
- // This is a kludge to deal with enumerators, which crash the doSwitch.
- //
- if (object instanceof EObject && ((EObject) object).eClass() == null) {
- return null;
- }// if
-
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }// if
- }// if
-
- return null;
- }// adapt
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }// removeListener
-
- /**
- * This delegates to change Notifier and to parent AdapterFactory.
- *
- * @param Object
- * object - The given object.
- * @param int
- * eventType - The given type of event.
- * @param Object
- * feature - The given feature.
- * @param Object
- * oldValue - The old value of the event.
- * @param Object
- * nreValue - The new value of the event.
- * @param int
- * index - The current index
- */
- public void fireNotifyChanged(Notification msg) {
- changeNotifier.fireNotifyChanged(msg);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(msg);
- }// if
- }// fireNotifyChanged
-
-}// JcaItemProviderAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
deleted file mode 100644
index 8247725..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
+++ /dev/null
@@ -1,241 +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.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a License object.
- */
-public class LicenseItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - The adapt class.
- */
- public LicenseItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// LicenseItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addRequiredPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_License_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_License_description_feature", "_UI_License_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getLicense_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Required feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRequiredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_License_required_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_License_required_feature", "_UI_License_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getLicense_Required(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getLicense_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapt class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * License f_license = ((License)object); JcaPackage pkg = JcaPackage.eINSTANCE;; // This is for
- * the description feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the license", pkg.getLicense_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the required feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Required", "The
- * required property of the license", pkg.getLicense_Required(), true,
- * ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- *
- * }// if
- *
- * return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the License.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns License.gif.
- *
- * @param Object
- * object - The adapt class
- * @return Object
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/license_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- public String getText(Object object) {
- License license = ((License) object);
- if (license.getDescription() == null)
- return JCAResourceHandler.LicenseItemProvider_UI_0;
- return JCAResourceHandler.LicenseItemProvider_UI_0 + ":" + license.getDescription();
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(License.class)) {
- case JcaPackage.LICENSE__DESCRIPTION :
- case JcaPackage.LICENSE__REQUIRED :
- case JcaPackage.LICENSE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getLicense_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getLicense_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getLicense_Description() || feature == pkg.getLicense_Required()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// LicenseItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
deleted file mode 100644
index de1344a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
+++ /dev/null
@@ -1,139 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.MessageAdapter}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MessageAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MessageAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getMessageAdapter_MessageListeners());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns MessageAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/MessageAdapter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- return JCAResourceHandler._UI_MessageAdapter_type;
- //return getString("_UI_MessageAdapter_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageAdapter.class)) {
- case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getMessageAdapter_MessageListeners(), JcaFactory.eINSTANCE.createMessageListener()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
deleted file mode 100644
index 23982cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
+++ /dev/null
@@ -1,156 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.MessageListener}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MessageListenerItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MessageListenerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addMessageListenerTypePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Message Listener Type feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addMessageListenerTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageListener_messageListenerType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageListener_messageListenerType_feature", "_UI_MessageListener_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getMessageListener_MessageListenerType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getMessageListener_ActivationSpec());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns MessageListener.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/MessageListener"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((MessageListener) object).getMessageListenerType();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_MessageListener_type :
- JCAResourceHandler._UI_MessageListener_type + " " + label;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageListener.class)) {
- case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE :
- case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getMessageListener_ActivationSpec(), JcaFactory.eINSTANCE.createActivationSpec()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
deleted file mode 100644
index 95f9324..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,187 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.OutboundResourceAdapter}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class OutboundResourceAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public OutboundResourceAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addReauthenticationSupportPropertyDescriptor(object);
- addTransactionSupportPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Reauthentication Support feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addReauthenticationSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_OutboundResourceAdapter_reauthenticationSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OutboundResourceAdapter_reauthenticationSupport_feature", "_UI_OutboundResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getOutboundResourceAdapter_ReauthenticationSupport(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Transaction Support feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransactionSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_OutboundResourceAdapter_transactionSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OutboundResourceAdapter_transactionSupport_feature", "_UI_OutboundResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getOutboundResourceAdapter_TransactionSupport(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getOutboundResourceAdapter_ConnectionDefinitions());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns OutboundResourceAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/OutboundResourceAdapter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- // OutboundResourceAdapter outboundResourceAdapter = (OutboundResourceAdapter) object;
-
- return JCAResourceHandler._UI_OutboundResourceAdapter_type;
- //return getString("_UI_OutboundResourceAdapter_type") /*+ " " +
- // outboundResourceAdapter.isReauthenticationSupport()*/; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(OutboundResourceAdapter.class)) {
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT :
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT :
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS :
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getOutboundResourceAdapter_ConnectionDefinitions(), JcaFactory.eINSTANCE.createConnectionDefinition()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getOutboundResourceAdapter_AuthenticationMechanisms(), JcaFactory.eINSTANCE.createAuthenticationMechanism()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
deleted file mode 100644
index e4e3cff..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
+++ /dev/null
@@ -1,159 +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.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.RequiredConfigPropertyType}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class RequiredConfigPropertyTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public RequiredConfigPropertyTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RequiredConfigPropertyType_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RequiredConfigPropertyType_name_feature", "_UI_RequiredConfigPropertyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns RequiredConfigPropertyType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/RequiredConfigPropertyType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((RequiredConfigPropertyType) object).getName();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_RequiredConfigPropertyType_type :
- JCAResourceHandler._UI_RequiredConfigPropertyType_type + " " + label;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(RequiredConfigPropertyType.class)) {
- case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME :
- case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java
deleted file mode 100644
index 75915a6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,399 +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.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a ResourceAdapter object.
- */
-public class ResourceAdapterItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - The adapt factory
- */
- public ResourceAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// ResourceAdapterItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addManagedConnectionFactoryClassPropertyDescriptor(object);
- addConnectionFactoryInterfacePropertyDescriptor(object);
- addConnectionFactoryImplClassPropertyDescriptor(object);
- addConnectionInterfacePropertyDescriptor(object);
- addConnectionImplClassPropertyDescriptor(object);
- addTransactionSupportPropertyDescriptor(object);
- addReauthenticationSupportPropertyDescriptor(object);
- addResourceAdapterClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Managed Connection Factory Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManagedConnectionFactoryClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_managedConnectionFactoryClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_managedConnectionFactoryClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ManagedConnectionFactoryClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionFactoryInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionFactoryInterface_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionFactoryInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Impl Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionFactoryImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionFactoryImplClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionFactoryImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionInterface_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Impl Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionImplClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Transaction Support feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransactionSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_transactionSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_transactionSupport_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_TransactionSupport(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Reauthentication Support feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addReauthenticationSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_reauthenticationSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_reauthenticationSupport_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ReauthenticationSupport(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Resource Adapter Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addResourceAdapterClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_resourceAdapterClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_resourceAdapterClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ResourceAdapterClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * ResourceAdapter f_resourceAdapter = ((ResourceAdapter)object); JcaPackage pkg =
- * JcaPackage.eINSTANCE;; // This is for the managedConnectionFactoryClass feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Managed Connection
- * Factory Class", "The managed connection factory class property of the resource adapter",
- * pkg.getResourceAdapter_ManagedConnectionFactoryClass(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionFactoryInterface
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Factory
- * Interface", "The connection factory interface property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionFactoryInterface(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionFactoryImplClass
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Factory
- * Impl Class", "The connection factory impl class property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionFactoryImplClass(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionInterface feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Interface",
- * "The connection interface property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionInterface(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionImplClass feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Impl
- * Class", "The connection impl class property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionImplClass(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the transactionSupport feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Transaction Support",
- * "The transaction support property of the resource adapter",
- * pkg.getResourceAdapter_TransactionSupport(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); // This is for the reauthenticationSupport
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Reauthentication
- * Support", "The reauthentication support property of the resource adapter",
- * pkg.getResourceAdapter_ReauthenticationSupport(), true,
- * ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This specifies how to implement AddCommand and RemoveCommand support in createCommand.
- *
- * @param Object
- * object - The adapt class.
- * @return Collection
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- int version = J2EEVersionConstants.JCA_1_0_ID;
- if (object instanceof ResourceAdapter)
- version = ((Connector) ((EObject) object).eContainer()).getVersionID();
-
- switch (version) {
- case J2EEVersionConstants.JCA_1_0_ID :
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties());
- break;
- case J2EEVersionConstants.JCA_1_5_ID :
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_InboundResourceAdapter());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AdminObjects());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties());
- break;
- }
-
- }// if
- return childrenReferences;
- }// getChildrenReferences
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the parent of the ResourceAdapter.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns ResourceAdapter.gif.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/resource_adapter_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- public String getText(Object object) {
- // ResourceAdapter resourceAdapter = ((ResourceAdapter) object);
- //return "ResourceAdapter: " + resourceAdapter.getManagedConnectionFactoryClass();
- // //$NON-NLS-1$
- return JCAResourceHandler._UI_ResourceAdapter_type;
-
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ResourceAdapter.class)) {
- case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT :
- case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT :
- case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS :
- case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS :
- case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES :
- case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER :
- case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER :
- case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions(), JcaFactory.eINSTANCE.createSecurityPermission()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms(), JcaFactory.eINSTANCE.createAuthenticationMechanism()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter(), JcaFactory.eINSTANCE.createOutboundResourceAdapter()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_InboundResourceAdapter(), JcaFactory.eINSTANCE.createInboundResourceAdapter()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_AdminObjects(), JcaFactory.eINSTANCE.createAdminObject()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JcaPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getResourceAdapter_ManagedConnectionFactoryClass() || feature == pkg.getResourceAdapter_ConnectionFactoryInterface() || feature == pkg.getResourceAdapter_ConnectionFactoryImplClass() || feature == pkg.getResourceAdapter_ConnectionInterface() || feature == pkg.getResourceAdapter_ConnectionImplClass() || feature == pkg.getResourceAdapter_TransactionSupport() || feature == pkg.getResourceAdapter_ReauthenticationSupport() || feature == pkg.getResourceAdapter_SecurityPermissions() || feature == pkg.getResourceAdapter_AuthenticationMechanisms() || feature == pkg.getResourceAdapter_ConfigProperties()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// ResourceAdapterItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
deleted file mode 100644
index 2696f38..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
+++ /dev/null
@@ -1,242 +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.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a SecurityPermission object.
- */
-public class SecurityPermissionItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - The adapt factory.
- */
- public SecurityPermissionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// SecurityPermissionItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addSpecificationPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityPermission_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityPermission_description_feature", "_UI_SecurityPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getSecurityPermission_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Specification feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSpecificationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityPermission_specification_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityPermission_specification_feature", "_UI_SecurityPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getSecurityPermission_Specification(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * SecurityPermission f_securityPermission = ((SecurityPermission)object); JcaPackage pkg =
- * JcaPackage.eINSTANCE;; // This is for the description feature. // itemPropertyDescriptors.add
- * (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the security permission", pkg.getSecurityPermission_Description(),
- * true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the specification feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Specification", "The
- * specification property of the security permission",
- * pkg.getSecurityPermission_Specification(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the SecurityPermission.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns SecurityPermission.gif.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/security_permission_obj"); //$NON-NLS-1$
- }// getImage
-
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- public String getText(Object object) {
- SecurityPermission securityPermission = ((SecurityPermission) object);
- if (securityPermission.getDescription() == null)
- return JCAResourceHandler.SecurityPermissionItemProvider_UI_0;
- return JCAResourceHandler.SecurityPermissionItemProvider_UI_0 + ": " + securityPermission.getDescription();
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SecurityPermission.class)) {
- case JcaPackage.SECURITY_PERMISSION__DESCRIPTION :
- case JcaPackage.SECURITY_PERMISSION__SPECIFICATION :
- case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getSecurityPermission_Description() || feature == pkg.getSecurityPermission_Specification()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// SecurityPermissionItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.properties b/plugins/org.eclipse.jst.j2ee.jca/plugin.properties
deleted file mode 100644
index c3dc627..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.properties
+++ /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
-###############################################################################
-connector_validator_UI_=Connector Validator
-CONN_FACET_LABEL=J2C Module
-CONN_FACET_DESCRIPTION=Enables the project to be deployed as a J2C module.
-CONN_FACET_TEMPLATE=J2C Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
deleted file mode 100644
index 6d64cc2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
- <extension
- id="JcaModuleExtension"
- name="JcaModuleExtension"
- point="org.eclipse.jst.j2ee.EARModuleExtension">
- <earModuleExtension
- extensionClass="org.eclipse.jst.j2ee.jca.internal.plugin.JcaModuleExtensionImpl">
- </earModuleExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.jca.providers.JcaItemProviderAdapterFactory"
- packageURI="jca.xmi"
- id="org.eclipse.jst.j2ee.jca.providers.JcaItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- id="ConnectorValidator"
- name="%connector_validator_UI_"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <projectNature
- id="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </projectNature>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="MANIFEST.MF">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="rar.xml">
- </filter>
- <helper
- class="org.eclipse.jst.j2ee.internal.jca.validation.ConnectorHelper">
- </helper>
- <run
- class="org.eclipse.jst.j2ee.internal.jca.validation.UIConnectorValidator">
- </run>
- </validator>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.connector"
- factoryClass="org.eclipse.wst.common.componentcore.internal.impl.ArtifactEditModelFactory">
- <editModelResource
- autoload="false"
- URI="META-INF/ra.xml"/>
- </editModel>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.artifactedit">
- <artifactedit
- typeID="jst.connector"
- class="org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit">
- </artifactedit>
- </extension>
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="jst.connector.builder"
- providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
- </extension>
-
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.connector">
- <label>%CONN_FACET_LABEL</label>
- <description>%CONN_FACET_DESCRIPTION</description>
- <icon>icons/full/obj16/Connector.gif</icon>
- </project-facet>
-
- <project-facet-version facet="jst.connector" version="1.0">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.connector" version="1.5">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <template id="template.jst.connector">
- <label>%CONN_FACET_TEMPLATE</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.connector"/>
- </template>
-
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml
deleted file mode 100644
index f22ea3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.jca"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties b/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties
deleted file mode 100644
index a201682..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties
+++ /dev/null
@@ -1,22 +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
-###############################################################################
-LicenseItemProvider_UI_0=License
-SecurityPermissionItemProvider_UI_0=SecurityPermission
-ConfigPropertyItemProvider_UI_0=ConfigProperty
-_UI_ResourceAdapter_type=ResourceAdapter
-_UI_OutboundResourceAdapter_type=OutboundResourceAdapter
-_UI_ConnectionDefinition_type=ConnectionDefinition
-_UI_InboundResourceAdapter_type=InboundResourceAdapter
-_UI_MessageAdapter_type=MessageAdapter
-_UI_MessageListener_type=MessageListener
-_UI_ActivationSpec_type=ActivationSpec
-_UI_RequiredConfigPropertyType_type=RequiredConfigProperty
-_UI_AdminObject_type=AdminObject
diff --git a/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties b/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties
deleted file mode 100644
index c6b1f3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0001E Document type version "{0}" for rar.xml in project "{1}" needs to be version "{2}".
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModelProvider.java
deleted file mode 100644
index 77f3667..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,166 +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.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * @deprecated
- * @see ConnectorFacetProjectCreationDataModelProvider
- */
-
-public class ConnectorComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IConnectorComponentCreationDataModelProperties {
-
- public ConnectorComponentCreationDataModelProvider() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.application.operations.FlexibleJ2EEModuleCreationDataModel#getDefaultJ2EEModuleVersion()
- */
- protected Integer getDefaultComponentVersion() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- switch (highestJ2EEPref) {
- case (J2EEVersionConstants.J2EE_1_4_ID) :
- return new Integer(J2EEVersionConstants.JCA_1_5_ID);
- case (J2EEVersionConstants.J2EE_1_3_ID) :
- return new Integer(J2EEVersionConstants.JCA_1_0_ID);
- case (J2EEVersionConstants.J2EE_1_2_ID) :
- return null;
- default :
- return new Integer(J2EEVersionConstants.JCA_1_5_ID);
- }
- }
-
- protected DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- DataModelPropertyDescriptor[] descriptors = null;
- switch (highestJ2EEPref) {
- case J2EEVersionConstants.J2EE_1_3_ID :
- descriptors = new DataModelPropertyDescriptor[1];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.JCA_1_0_ID), J2EEVersionConstants.VERSION_1_0_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_4_ID :
- default :
- descriptors = new DataModelPropertyDescriptor[2];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.JCA_1_0_ID), J2EEVersionConstants.VERSION_1_0_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.JCA_1_5_ID), J2EEVersionConstants.VERSION_1_5_TEXT);
- break;
- }
- return descriptors;
- }
-
- protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
- switch (moduleVersion) {
- case J2EEVersionConstants.JCA_1_0_ID :
- return J2EEVersionConstants.J2EE_1_3_ID;
- case J2EEVersionConstants.JCA_1_5_ID :
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
- return 0;
- }
-
- protected Integer convertJ2EEVersionToModuleVersion(Integer j2eeVersion) {
- switch (j2eeVersion.intValue()) {
- case J2EEVersionConstants.J2EE_1_3_ID :
- return new Integer(J2EEVersionConstants.JCA_1_0_ID);
- case J2EEVersionConstants.J2EE_1_4_ID :
- return new Integer(J2EEVersionConstants.JCA_1_5_ID);
- }
- return super.convertJ2EEVersionToModuleVersion(j2eeVersion);
- }
-
- protected EClass getComponentType() {
- return CommonarchivePackage.eINSTANCE.getRARFile();
- }
-
- protected String getComponentExtension() {
- return ".rar"; //$NON-NLS-1$
- }
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
- if (propertyName.equals(COMPONENT_VERSION)) {
- Integer propertyValue = (Integer) getProperty(propertyName);
- String description = null;
- switch (propertyValue.intValue()) {
- case J2EEVersionConstants.JCA_1_0_ID :
- description = J2EEVersionConstants.VERSION_1_0_TEXT;
- break;
- case J2EEVersionConstants.JCA_1_5_ID :
- default :
- description = J2EEVersionConstants.VERSION_1_5_TEXT;
- break;
- }
- return new DataModelPropertyDescriptor(propertyValue, description);
- }
- return super.getPropertyDescriptor(propertyName);
- }
-
-
- public IDataModelOperation getDefaultOperation() {
- //return new ConnectorComponentCreationOperation(model);
- return new ConnectorComponentCreationFacetOperation(model);
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(MANIFEST_FOLDER)) {
- return IPath.SEPARATOR + CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
- }
- if (propertyName.equals(ADD_TO_EAR)) {
- return Boolean.TRUE;
- }
- if (propertyName.equals(DD_FOLDER)) {
- return IPath.SEPARATOR + CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
- }
- if (propertyName.equals(JAVASOURCE_FOLDER)) {
- return CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER;
- } else if (propertyName.equals(MODULE_URI)) {
- return getProject().getName()+IJ2EEModuleConstants.RAR_EXT;
- }
-
- return super.getDefaultProperty(propertyName);
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- public IStatus validate(String propertyName) {
- return super.validate(propertyName);
- }
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean doSet = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(JAVASOURCE_FOLDER)){
- //unless MANIFEST folder is opened up, it is set as same as Java source folder
- setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF);
- }
- return doSet;
- }
-
- protected String getJ2EEProjectType() {
- return J2EEProjectUtilities.JCA;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationFacetOperation.java
deleted file mode 100644
index 3c396d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.jca.operations;
-
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEComponentCreationFacetOperation;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation {
-
- public ConnectorComponentCreationFacetOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(setupJavaInstallAction());
- IDataModel newModel = setupConnectorInstallAction();
- map.add(newModel);
- setRuntime(newModel, dm); // Setting runtime property
- setAddToEARFromWizard(newModel);
- IStatus stat = dm.getDefaultOperation().execute(monitor, info);
- if (stat.isOK()) {
- String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- if (earProject != null && earProject.exists())
- stat = addtoEar(projectName, earProjectName);
- }
-
- return stat;
- }
-
- protected IDataModel setupConnectorInstallAction() {
- String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
- IDataModel connectorFacetInstallDataModel = DataModelFactory.createDataModel(new ConnectorFacetInstallDataModelProvider());
- connectorFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- connectorFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
- connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
- connectorFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
- if (model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR))
- connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME, model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
- connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, model.getProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
- connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(IJ2EEComponentCreationDataModelProperties.RUNTIME_TARGET_ID));
- return connectorFacetInstallDataModel;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java
deleted file mode 100644
index 9684058..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,70 +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.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.jca.archive.operations.ConnectorComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ConnectorComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider {
-
- public ConnectorComponentExportDataModelProvider() {
- super();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new ConnectorComponentExportOperation(model);
- }
-
- protected String getProjectType() {
- return J2EEProjectUtilities.JCA;
- }
-
- protected String getWrongComponentTypeString(String projectName) {
- return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_A_RAR, new Object[]{projectName});
- }
-
- protected String getModuleExtension() {
- return ".rar"; //$NON-NLS-1$
- }
- /**
- * Exports the specified Connector Module project to the specified Connector RAR file.
- *
- * @param connectorProjectName
- * The name of the Connector Module project to export.
- * @param rarFileName
- * The fully qualified Connector RAR file location to export the specified Connector
- * Module project.
- * @param overwriteExisting
- * If this is <code>true</code> then an existing file at the location specified by
- * <code>earFileName</code> will be overwritten.
- * @param exportSource
- * If this is <code>true</code> then all source files in the specified Connector
- * Module will be included in the resulting Connector RAR file.
- * @plannedfor WTP 1.0
- */
-// public static void exportProject(String connectorProjectName, String rarFileName, boolean overwriteExisting, boolean exportSource) {
-// ConnectorModuleExportDataModel dataModel = new ConnectorModuleExportDataModel();
-// dataModel.setProperty(PROJECT_NAME, connectorProjectName);
-// dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-// dataModel.setProperty(ARCHIVE_DESTINATION, rarFileName);
-// dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-// try {
-// dataModel.getDefaultOperation().run(null);
-// } catch (InvocationTargetException e) {
-// Logger.getLogger().logError(e);
-// } catch (InterruptedException e) {
-// Logger.getLogger().logError(e);
-// }
-// }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java
deleted file mode 100644
index 91995ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,55 +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.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * This dataModel is used for to import Connector Modules (from RAR files) into the workspace.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public final class ConnectorComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider {
-
- public void init() {
- super.init();
- setIntProperty(IConnectorComponentCreationDataModelProperties.COMPONENT_VERSION, J2EEVersionConstants.J2EE_1_3_ID);
- }
-
- protected int getType() {
- return XMLResource.RAR_TYPE;
- }
-
- protected Archive openArchive(String uri) throws OpenFailureException {
- Archive archive = CommonarchiveFactory.eINSTANCE.openRARFile(getArchiveOptions(), uri);
- return archive;
- }
-
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new ConnectorComponentCreationDataModelProvider());
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new ConnectorComponentImportOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java
deleted file mode 100644
index 5b11d11..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java
+++ /dev/null
@@ -1,75 +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.jst.j2ee.internal.jca.operations;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.internal.archive.operations.ConnectorComponentSaveStrategyImpl;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentImportOperation extends J2EEArtifactImportOperation {
-
- private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
-
- public ConnectorComponentImportOperation(IDataModel model) {
- super(model);
- }
-
- protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
- super.doExecute(monitor);
- addAssociateArchivesToClassPath();
- }
-
- /**
- * Adds all jar within the file to the classpath.
- */
- protected void addAssociateArchivesToClassPath() {
- List extraEntries = new ArrayList();
- List archiveList = moduleFile.getArchiveFiles();
- Iterator iterator = archiveList.iterator();
- IVirtualFile vFile = null;
- IFile file = null;
- while (iterator.hasNext()) {
- Archive anArchive = (Archive) iterator.next();
- if (anArchive.getName().endsWith(JAR_EXTENSION)) {
- vFile = virtualComponent.getRootFolder().getFile(anArchive.getURI());
- if (vFile.exists()) {
- file = vFile.getUnderlyingFile();
- extraEntries.add(JavaCore.newLibraryEntry(file.getFullPath(), file.getFullPath(), null, true));
- }
- }
- }
- try {
- addToClasspath(getDataModel(), extraEntries);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- protected SaveStrategy createSaveStrategy(IVirtualComponent component) {
- ConnectorComponentSaveStrategyImpl saveStrat = new ConnectorComponentSaveStrategyImpl(component);
- return saveStrat;
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentCreationDataModelProperties.java
deleted file mode 100644
index 0ce7df6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,35 +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.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-/**
- * <p>
- * IConnectorComponentCreationDataModelProperties provides properties to the
- * ConnectorComponentCreationDataModelProvider as well as all extending interfaces extending
- * IConnectorComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-public interface IConnectorComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java
deleted file mode 100644
index fc5a54a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,32 +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.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-/**
- * <p>
- * IConnectorComponentExportDataModel provides properties to the IDataModel associated with the
- * ConnectorComponentExportDataModelProvider.\
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IConnectorComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java
deleted file mode 100644
index f172846..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,32 +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.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-/**
- * <p>
- * IConnectorComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * ConnectorComponentImportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IConnectorComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/rartp10.xml b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/rartp10.xml
deleted file mode 100644
index 6d5bc9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/rartp10.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" "http://java.sun.com/dtd/connector_1_0.dtd">
-<connector>
- <display-name></display-name>
- <description></description>
- <vendor-name></vendor-name>
- <spec-version></spec-version>
- <eis-type></eis-type>
- <version></version>
- <license>
- <description></description>
- <license-required>false</license-required>
- </license>
- <resourceadapter>
- <managedconnectionfactory-class></managedconnectionfactory-class>
- <connectionfactory-interface></connectionfactory-interface>
- <connectionfactory-impl-class></connectionfactory-impl-class>
- <connection-interface></connection-interface>
- <connection-impl-class></connection-impl-class>
- <transaction-support></transaction-support>
- <config-property>
- <description></description>
- <config-property-name></config-property-name>
- <config-property-type></config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <authentication-mechanism>
- <description></description>
- <authentication-mechanism-type></authentication-mechanism-type>
- <credential-interface></credential-interface>
- </authentication-mechanism>
- <reauthentication-support>false</reauthentication-support>
- <security-permission>
- <description></description>
- <security-permission-spec>
- </security-permission-spec>
- </security-permission>
- </resourceadapter>
-</connector>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/rartp15.xml b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/rartp15.xml
deleted file mode 100644
index 029561d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/rartp15.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector id="Connector_ID" version="1.5" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd">
- <description></description>
- <display-name></display-name>
- <vendor-name></vendor-name>
- <eis-type></eis-type>
- <resourceadapter-version></resourceadapter-version>
- <resourceadapter>
- </resourceadapter>
-</connector>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java
deleted file mode 100644
index 52d9ed6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.internal.module.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-public class ConnectorEditAdapterFactory implements IAdapterFactory {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == ConnectorArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
- ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
- if (J2EEProjectUtilities.isJCAProject(editModel.getProject()))
- return new ConnectorArtifactEdit((ArtifactEditModel) adaptableObject);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{ArtifactEdit.class, ConnectorEditAdapterFactory.class};
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
deleted file mode 100644
index faf1343..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.jca.modulecore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.jca.archive.operations.ConnectorComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Provides access to J2EE Connector models using the ArtifactEdit pattern.
- * <p>
- * Clients should use getConnectorArtifactForRead/Write() to acquire an instance
- * of the correct artifact edit class.
- * </p>
- */
-public class ConnectorArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
- /**
- * <p>
- * Identifier used to link ConnectorArtifactEdit to a
- * ConnectorEditAdapterFactory {@see ConnectorEditAdapterFactory} stored in
- * an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = ConnectorArtifactEdit.class;
-
- /**
- *
- */
- public ConnectorArtifactEdit() {
- super();
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public ConnectorArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- public ConnectorArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.JCA);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
-
- public ConnectorArtifactEdit(ArtifactEditModel anArtifactEditModel) {
- super(anArtifactEditModel);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from
- * the given {@see ModuleCoreNature}
- */
-
- protected ConnectorArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * @return ConnectorResource from (@link getDeploymentDescriptorResource())
- */
-
- public ConnectorResource getConnectorXmiResource() {
- return (ConnectorResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using
- * defined URI.
- * </p>
- *
- * @return Resource
- */
-
- public Resource getDeploymentDescriptorResource() {
- return getArtifactEditModel().getResource(J2EEConstants.RAR_DD_URI_OBJ);
- }
-
- /**
- * <p>
- * Obtains the Connector (@see Connector) root object from the
- * ConnectorResource. If the root object does not exist, then one is created
- * (@link addConnectorIfNecessary(getConnectorXmiResource())). The root
- * object contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- */
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addConnectorIfNecessary(getConnectorXmiResource());
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (Connector) and populates
- * with data. Adds the root object to the deployment descriptor resource.
- * </p>
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource} Note: This method
- * is typically used for JUNIT - move?
- * </p>
- */
- protected void addConnectorIfNecessary(XMLResource aResource) {
-
- if (aResource != null && aResource.getContents().isEmpty()) {
- Connector connector = JcaFactory.eINSTANCE.createConnector();
- aResource.getContents().add(connector);
- URI moduleURI = getArtifactEditModel().getModuleURI();
- try {
- connector.setDisplayName(StructureEdit.getDeployedName(moduleURI));
- } catch (UnresolveableURIException e) {
- //Ignore
- }
- aResource.setID(connector, J2EEConstants.CONNECTOR_ID);
- // TODO add more mandatory elements
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the
- * underlying content model
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForRead(IProject aProject) {
- ConnectorArtifactEdit artifactEdit = null;
- try {
- if (isValidConnectorModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new ConnectorArtifactEdit(aProject, true, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForWrite(IProject aProject) {
- ConnectorArtifactEdit artifactEdit = null;
- try {
- if (isValidConnectorModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new ConnectorArtifactEdit(aProject, false, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ConnectorArtifactEdit that
- * are returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ConnectorArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ConnectorArtifactEdit that may only be used to
- * read the underlying content model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForRead(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getConnectorArtifactEditForRead(aModule.getProject());
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ConnectorArtifactEdit that
- * are returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ConnectorArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ConnectorArtifactEdit that may be used to modify
- * and persist changes to the underlying content model
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForWrite(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getConnectorArtifactEditForWrite(aModule.getProject());
- }
-
- /**
- * @param module
- * A {@see WorkbenchComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidConnectorModule(IVirtualComponent aModule) throws UnresolveableURIException {
- if (!isValidEditableModule(aModule))
- return false;
- /* and match the JST_Connector_MODULE type */
- return J2EEProjectUtilities.isJCAProject(aModule.getProject());
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from ConnectorResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- */
-
- public int getJ2EEVersion() {
- return getConnectorXmiResource().getJ2EEVersionID();
- }
-
- /**
- * @return Connector from (@link getDeploymentDescriptorRoot())
- */
- public Connector getConnector() {
- return (Connector) getDeploymentDescriptorRoot();
- }
-
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(java.lang.Integer)
- */
- public EObject createModelRoot(int version) {
- ConnectorResource res = (ConnectorResource) getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addConnectorIfNecessary(res);
- return ((ConnectorResource) getDeploymentDescriptorResource()).getRootObject();
- }
-
- public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
-
- return getConnectorArtifactEditForRead(aComponent);
- }
-
- public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
- return getConnectorArtifactEditForWrite(aComponent);
- }
-
- public Archive asArchive(boolean includeSource) throws OpenFailureException{
- ConnectorComponentLoadStrategyImpl loader = new ConnectorComponentLoadStrategyImpl(getComponent());
- loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- return CommonarchiveFactory.eINSTANCE.openRARFile(loader, uri);
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- ConnectorArtifactEdit jcaEdit = new ConnectorArtifactEdit(project,false,true);
- try {
- jcaEdit.createModelRoot(version);
- jcaEdit.save(null);
- } finally {
- jcaEdit.dispose();
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml
deleted file mode 100644
index b428bb6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>WebArtifactEdit api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the ConnectorArtifactEdit api. This api is used to work with the emf model
- of a flexible connector module. It contains api to read and serialize out the emf model for connector modules.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject b/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject
deleted file mode 100644
index 8e388b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject>
-<data>
-<item id="cdt_indexer">
-<indexEnabled indexValue="true"/>
-</item>
-</data>
-</cdtproject>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath b/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath
deleted file mode 100644
index 724dc5c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="j2ee-navigator/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore
deleted file mode 100644
index eb62e2c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-j2ee-navigator.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project b/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
deleted file mode 100644
index d856d10..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.navigator.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>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 4cd3c4d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.j2ee.navigator.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.navigator.internal,
- org.eclipse.jst.j2ee.navigator.internal.dnd,
- org.eclipse.jst.j2ee.navigator.internal.plugin,
- org.eclipse.jst.j2ee.navigator.internal.workingsets
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.navigator.views,
- org.eclipse.wst.common.navigator.workbench,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ui,
- org.eclipse.emf.edit,
- org.eclipse.emf.edit.ui,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jdt.ui,
- org.eclipse.jst.j2ee,
- org.eclipse.jface.text,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.ui.ide,
- org.eclipse.jdt.core,
- org.eclipse.jst.ejb.ui,
- org.eclipse.jst.servlet.ui,
- org.eclipse.jst.j2ee.jca.ui,
- org.eclipse.jst.common.navigator.java,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.util,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.project.facet.core
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html b/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties
deleted file mode 100644
index 649ce90..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-bin.includes = plugin.xml,\
- *.jar,\
- .,\
- icons/,\
- plugin.properties,\
- META-INF/,\
- about.html
-src.includes = icons,\
- schema/
-source.. = j2ee-navigator/
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif
deleted file mode 100644
index c456568..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif
deleted file mode 100644
index 6f83300..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif
deleted file mode 100644
index 2270b17..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif
deleted file mode 100644
index 099201b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif
deleted file mode 100644
index 5644b48..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca5..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c47..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 56d7fa7..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif
deleted file mode 100644
index 231f8d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 625e763..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 3515396..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index a327fa6..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index adca79e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 351a31d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 67754de..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index d123519..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index d964e2e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif
deleted file mode 100644
index 36a73ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java
deleted file mode 100644
index e42c31e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public abstract class EMFModelManager {
- private final IProject project;
- private final EMFRootObjectProvider provider;
- public abstract Object[] getModels();
- public final IProject getProject() {
- return project;
- }
- public final EMFRootObjectProvider getEMFRootObjectProvider(){
- return provider;
- }
- public EMFModelManager(IProject aProject, EMFRootObjectProvider aProvider) {
- project = aProject;
- provider = aProvider;
- }
-
- /**
- * @param affectedProject
- */
- protected void notifyListeners(IProject affectedProject) {
- provider.notifyListeners(affectedProject);
- }
- /**
- *
- */
- public abstract void dispose();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java
deleted file mode 100644
index bbbda14..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EMFModelManagerFactory {
- public static EMFModelManager createEMFModelManager(IProject project, EMFRootObjectProvider provider) {
- boolean flexible = (ModuleCoreNature.getModuleCoreNature(project) != null);
- EMFModelManager modelManager = null;
- if (flexible)
- modelManager = new FlexibleEMFModelManager(project,provider);
- else
- modelManager = new NonFlexibleEMFModelManager(project,provider);
- return modelManager;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java
deleted file mode 100644
index 1633456..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java
+++ /dev/null
@@ -1,253 +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.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-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.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class EMFRootObjectManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor {
-
-
-
- private final Map projectEditModels = new HashMap();
- private final Map projectRootObjects = new HashMap();
-
- private final List listeners = new ArrayList();
-
- public interface IRefreshHandlerListener {
- void onRefresh(Object element);
- }
-
- /**
- *
- */
- public EMFRootObjectManager() {
- super();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
-
-
- public void dispose() {
- if (projectEditModels == null)
- return;
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- EditModel editModel = null;
- Object[] keys = projectEditModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- editModel = (EditModel) projectEditModels.remove(keys[i]);
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- }
- }
- }
-
- public Object getRootObject(IProject project) {
- if (project == null || !project.isAccessible())
- return null;
-
- Object rootObject = null;
- synchronized (projectRootObjects) {
- rootObject = projectRootObjects.get(project);
-
- if (rootObject == null || ((EObject) rootObject).eResource() == null) {
- EditModel editModel = getEditModelForProject(project);
- if (editModel != null) {
- rootObject = editModel.getPrimaryRootObject();
- projectRootObjects.put(project, rootObject);
- }
- }
- }
- return rootObject;
- }
-
-
- protected EditModel getEditModelForProject(IProject project) {
- if (project == null)
- return null;
- EditModel editModel = null;
- synchronized (projectEditModels) {
- editModel = (EditModel) projectEditModels.get(project);
- IVirtualComponent component = ComponentCore.createComponent(project);
- ArtifactEdit artifactEdit = null;
- try {
- if (editModel == null && project.isAccessible()) {
- artifactEdit = ArtifactEdit.getArtifactEditForRead(component);
- if (artifactEdit != null) {
- editModel = (EditModel) artifactEdit.getAdapter(EditModel.class);
- if (editModel != null) {
- editModel.addListener(this);
- addMapping(project, editModel);
- }
- }
- }
- } finally {
- if (artifactEdit!=null)
- artifactEdit.dispose();
- }
- }
- return editModel;
- }
-
- protected void addMapping(IProject project, EditModel editModel) {
- projectEditModels.put(project, editModel);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- IProject affectedProject = anEvent.getEditModel().getProject();
- switch (anEvent.getEventCode()) {
- case EditModelEvent.UNLOADED_RESOURCE :
- case EditModelEvent.REMOVED_RESOURCE : {
- Object oldRootObject = projectRootObjects.remove(affectedProject);
- if (oldRootObject != null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.SAVE : {
- Object oldRootObject = projectRootObjects.get(affectedProject);
- if (oldRootObject == null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.PRE_DISPOSE :
- disposeCache(affectedProject);
- break;
- default :
- break;
- }
- }
-
-
- /**
- * @param aProject
- */
- private void notifyListeners(IProject aProject) {
- for (int x = 0; x < listeners.size(); ++x) {
- IRefreshHandlerListener refreshHandler = (IRefreshHandlerListener) listeners.get(x);
- refreshHandler.onRefresh(aProject);
- }
-
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- final IResourceDelta delta = event.getDelta();
-
- if (delta != null) {
- try {
- delta.accept(EMFRootObjectManager.this);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } catch (SWTException swte) {
- Logger.getLogger().logError(swte);
- } catch (SWTError swte) {
- Logger.getLogger().logError(swte);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource != null) {
- switch (resource.getType()) {
- case IResource.ROOT :
- return true;
- case IResource.PROJECT :
- boolean projectOpenStateChanged = ((delta.getFlags() & IResourceDelta.OPEN) != 0);
- if (delta.getKind() == IResourceDelta.REMOVED || projectOpenStateChanged)
- disposeCache((IProject) resource);
- return false;
- }
- }
- return false;
- }
-
-
- protected void disposeCache(IProject affectedProject) {
- synchronized (projectEditModels) {
- projectRootObjects.remove(affectedProject);
- //System.out.println("REMOVING edit model: " + affectedProject.getName());
- EditModel editModel = (EditModel) projectEditModels.remove(affectedProject);
- //System.out.println("REMOVED edit model " + affectedProject.getName());
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- //System.out.println("RELEASED edit model " + affectedProject.getName());
- }
- }
- }
-
- public void addRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (getListeners()) {
- if (aListener != null && !getListeners().contains(aListener))
- getListeners().add(aListener);
- }
- }
-
- public void removeRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (listeners) {
- listeners.remove(aListener);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (4/11/2001 4:42:58 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getListeners() {
- return listeners;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java
deleted file mode 100644
index 3a1d2e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EMFRootObjectProvider implements IResourceChangeListener, IResourceDeltaVisitor{
- private final HashMap emfModelCache = new HashMap();
- private final List listeners = new ArrayList();
-
- public interface IRefreshHandlerListener {
- void onRefresh(Object element);
- }
-
- /**
- *
- */
- public EMFRootObjectProvider() {
- super();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
- public Object[] getModels(IProject project){
- try {
- EMFModelManager modelManager = (EMFModelManager) emfModelCache.get(project);
- if (modelManager == null) {
- synchronized (emfModelCache) {
- modelManager= EMFModelManagerFactory.createEMFModelManager(project,this) ;
- emfModelCache.put(project,modelManager);
- }
- }
- return modelManager.getModels();
- } catch (Exception ex) {
- //ex.printStackTrace();
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- final IResourceDelta delta = event.getDelta();
-
- if (delta != null) {
- try {
- delta.accept(EMFRootObjectProvider.this);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } catch (SWTException swte) {
- Logger.getLogger().logError(swte);
- } catch (SWTError swte) {
- Logger.getLogger().logError(swte);
- }
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource != null) {
- switch (resource.getType()) {
- case IResource.ROOT :
- return true;
- case IResource.PROJECT :
- boolean projectOpenStateChanged = ((delta.getFlags() & IResourceDelta.OPEN) != 0);
- if (delta.getKind() == IResourceDelta.REMOVED || projectOpenStateChanged) {
- IProject project = (IProject) resource;
- dispose(project);
- }
- return false;
- }
- }
- return false;
- }
-
- private void dispose(IProject project) {
- if (project == null) return;
- EMFModelManager modelManager = (EMFModelManager) emfModelCache.remove(project);
- if (modelManager != null) {
- modelManager.dispose();
- modelManager = null;
- }
- }
- public void dispose() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- EMFModelManager modelManager = null;
- Object[] keys = emfModelCache.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- modelManager = (EMFModelManager) emfModelCache.remove(keys[i]);
- if (modelManager != null) {
- modelManager.dispose();
- }
- }
- }
-
-
- /**
- * @param aProject
- */
- public void notifyListeners(IProject aProject) {
- for (int x = 0; x < listeners.size(); ++x) {
- IRefreshHandlerListener refreshHandler = (IRefreshHandlerListener) listeners.get(x);
- refreshHandler.onRefresh(aProject);
- }
-
- }
-
- public void addRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (getListeners()) {
- if (aListener != null && !getListeners().contains(aListener))
- getListeners().add(aListener);
- }
- }
-
- public void removeRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (listeners) {
- listeners.remove(aListener);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (4/11/2001 4:42:58 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getListeners() {
- return listeners;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java
deleted file mode 100644
index f5cf432..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FlexibleEMFModelManager extends EMFModelManager implements EditModelListener{
-
- private List rootObjects = new ArrayList();
- private static final Object[] EMPTY_OBJECT = new Object[0];
- private final List artifactEdits = new ArrayList();
- private StructureEdit moduleCore;
- private final Map artifactEditToRootObject = new HashMap();
-
- /**
- * @param aProject
- * @param provider
- */
- public FlexibleEMFModelManager(IProject aProject, EMFRootObjectProvider provider) {
- super(aProject,provider);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#getModels()
- */
- public Object[] getModels() {
- try {
-
- IProject project = getProject();
- if ( project== null || !project.isAccessible())
- return EMPTY_OBJECT;
-
- synchronized (rootObjects) {
- if (!isValid(rootObjects)) {
- rootObjects = getRootObjects();
- }
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- if (rootObjects != null) {
- return rootObjects.toArray() ;
- }
- return EMPTY_OBJECT;
-
- }
-
- private boolean isValid(List rootObjects) {
- if (rootObjects == null || rootObjects.size()==0)
- return false;
- for (int x=0; x< rootObjects.size(); ++x) {
- EObject eObject = (EObject) rootObjects.get(x);
- if (eObject != null && eObject.eResource() == null)
- return false;
- }
- return true;
- }
-
- /**
- * @param project
- * @return
- */
- private List getRootObjects() {
- List artifacts = getArtifactEdits();
- List flexibleObjects = new ArrayList();
- ArtifactEdit artifactEdit = null;
- EObject contentModelRoot = null;
- for (int x=0; x< artifacts.size(); ++x) {
- artifactEdit = (ArtifactEdit)artifacts.get(x);
- contentModelRoot = artifactEdit.getContentModelRoot();
- if (contentModelRoot != null) {
- flexibleObjects.add(contentModelRoot);
- if (!rootObjects.contains(contentModelRoot))
- rootObjects.add(contentModelRoot);
- artifactEditToRootObject.put(artifactEdit,contentModelRoot);
- }
- }
- return flexibleObjects;
- }
-
- protected List getArtifactEdits() {
-
- IProject project = getProject();
- if (project == null)
- return null;
- synchronized (artifactEdits) {
- if (artifactEdits.size() ==0 && project.isAccessible()) {
- StructureEdit moduleCore = getModuleCore();
- WorkbenchComponent[] workBenchModules = moduleCore.getWorkbenchModules();
- for (int i = 0; i < workBenchModules.length; i++) {
- WorkbenchComponent module = workBenchModules[i];
- ArtifactEdit artifactEdit = null;
- try{
- artifactEdit = ArtifactEdit.getArtifactEditForRead(project);
- if(artifactEdit != null) {
- artifactEdits.add(artifactEdit);
- artifactEdit.addListener(this);
- }
- } catch(Exception e){
- e.printStackTrace();
- }
- }
-
- }
- }
- return artifactEdits;
- }
-
- private StructureEdit getModuleCore() {
- if (moduleCore == null) {
- moduleCore = StructureEdit.getStructureEditForRead(getProject());
- }
- return moduleCore;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#dispose()
- */
- public void dispose() {
- if (artifactEdits != null) {
- for (int x=0; x< artifactEdits.size(); ++x) {
- ArtifactEdit artifactEdit = (ArtifactEdit)artifactEdits.get(x);
- if (artifactEdit != null) {
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
-
- }
- }
- if (moduleCore != null)
- moduleCore.dispose();
- rootObjects.clear();
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- IProject affectedProject = anEvent.getEditModel().getProject();
-
- switch (anEvent.getEventCode()) {
- case EditModelEvent.UNLOADED_RESOURCE :
- case EditModelEvent.REMOVED_RESOURCE : {
- Object oldRootObject = removeRootObject(anEvent.getEditModel(),affectedProject);
- getRootObjects();
- if (oldRootObject != null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.SAVE : {
- Object oldRootObject = getRootObject(anEvent.getEditModel(),affectedProject);
- if (oldRootObject == null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.PRE_DISPOSE :
- dispose(anEvent.getEditModel(),affectedProject);
- break;
- default :
- break;
- }
-
- }
-
-
-
- /**
- * @param editModel
- * @param affectedProject
- * @return
- */
- private Object getRootObject(EditModel editModel, IProject project) {
- ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
- if (artifactEdit != null) {
- return artifactEditToRootObject.get(artifactEdit);
- }
- return null;
- }
-
- /**
- * @param editModel
- * @param affectedProject
- * @return
- */
- private Object removeRootObject(EditModel editModel, IProject project) {
- ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
- if (artifactEdit != null) {
- rootObjects.remove(artifactEditToRootObject.get(artifactEdit));
- artifactEditToRootObject.remove(artifactEdit);
- }
- return artifactEdit;
- }
-
- /**
- * @param affectedProject
- * @param editModel
- */
- private void dispose( EditModel editModel, IProject project) {
- ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
- if (artifactEdit != null) {
- artifactEdit.removeListener(this);
- artifactEdits.remove(artifactEdit);
- artifactEditToRootObject.remove(artifactEdit);
- }
-
- }
-
- private ArtifactEdit getArtifactEdit(EditModel editModel, IProject project) {
- if (artifactEdits != null) {
- for (int x=0; x<artifactEdits.size(); ++x) {
- ArtifactEdit artifactEdit = (ArtifactEdit)artifactEdits.get(x);
- if (artifactEdit.hasEditModel(editModel))
- return artifactEdit;
- }
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java
deleted file mode 100644
index 75cf8b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java
+++ /dev/null
@@ -1,29 +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
- *******************************************************************************/
-/*
- * Created on Jul 7, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface IJ2EENavigatorConstants {
-
- String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java
deleted file mode 100644
index 1758945..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java
+++ /dev/null
@@ -1,74 +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.jst.j2ee.navigator.internal;
-
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentCreationWizard;
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard;
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentCreationWizard;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentCreationWizard;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentCreationWizard;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard;
-import org.eclipse.jst.servlet.ui.internal.wizard.WebComponentCreationWizard;
-import org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard;
-import org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- * <p>
- * The Creation IDs are used for activity filtering and as such are declared on the individual
- * wizards. All other IDs must be maintained to stay in sync with the values found in the plugin.xml
- * files of the respective module UI plugins.
- */
-public interface IJ2EEWizardConstants {
-
- String NEW_EAR_PROJECT_WIZARD_ID = EARComponentCreationWizard.WIZARD_ID;
-
- String NEW_APPCLIENT_PROJECT_WIZARD_ID = AppClientComponentCreationWizard.WIZARD_ID;
-
- String NEW_JCA_PROJECT_WIZARD_ID = ConnectorComponentCreationWizard.WIZARD_ID;
-
- String NEW_EJB_PROJECT_WIZARD_ID = EJBComponentCreationWizard.WIZARD_ID;
-
- String NEW_WEB_PROJECT_WIZARD_ID = WebComponentCreationWizard.WIZARD_ID;
-
- String NEW_ENTERPRISE_BEAN_WIZARD_ID = "org.eclipse.jst.j2ee.ejb.ui.util.createEJBWizard"; //$NON-NLS-1$
-
- String IMPORT_EAR_WIZARD_ID = EARComponentImportWizard.class.getName();
-
- String IMPORT_APPCLIENT_WIZARD_ID = AppClientComponentImportWizard.class.getName();
-
- String IMPORT_CONNECTOR_WIZARD_ID = ConnectorComponentImportWizard.class.getName();
-
- String IMPORT_ENTERPRISE_BEAN_WIZARD_ID = EJBComponentImportWizard.class.getName();
-
- String IMPORT_WEB_MODULE_WIZARD_ID = WebComponentImportWizard.class.getName();
-
- String IMPORT_UTILITY_JAR_WIZARD_ID = J2EEUtilityJarImportWizardNew.class.getName();
-
- String EXPORT_EAR_WIZARD_ID = EARComponentExportWizard.class.getName();
-
- String EXPORT_APPCLIENT_WIZARD_ID = AppClientComponentExportWizard.class.getName();
-
- String EXPORT_CONNECTOR_WIZARD_ID = ConnectorComponentExportWizard.class.getName();
-
- String EXPORT_ENTERPRISE_BEAN_WIZARD_ID = EJBComponentExportWizard.class.getName();
-
- String EXPORT_WEB_MODULE_WIZARD_ID = WebComponentExportWizard.class.getName();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java
deleted file mode 100644
index 3ff311b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java
+++ /dev/null
@@ -1,133 +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.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jst.j2ee.internal.actions.J2EERenameAction;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.wst.common.navigator.internal.provisional.views.ICommonActionProvider;
-import org.eclipse.wst.common.navigator.internal.provisional.views.NavigatorContentService;
-import org.eclipse.wst.common.navigator.internal.views.actions.CommonActionProvider;
-
-public class J2EEActionProvider extends CommonActionProvider implements ICommonActionProvider {
-
- private IViewPart viewPart;
-
- private OpenJ2EEResourceAction openAction;
-
- private J2EERenameAction renameAction;
-
- //private WTPOptionalOperationAction genericDelete;
- //TODO add back generic delete
- /**
- *
- */
- public J2EEActionProvider() {
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#init(org.eclipse.ui.IViewPart,
- * org.eclipse.jface.viewers.StructuredViewer,
- * org.eclipse.wst.common.navigator.internal.views.extensions.NavigatorContentService)
- */
- public void init(IViewPart aViewPart, StructuredViewer aViewer, NavigatorContentService aContentService) {
- viewPart = aViewPart;
-
- openAction = new OpenJ2EEResourceAction();
- renameAction = new J2EERenameAction(viewPart.getViewSite(), viewPart.getViewSite().getShell());
-//
-// genericDelete = new WTPOptionalOperationAction(WTPGenericActionIds.DELETE, WorkbenchMessages.Workbench_delete); //$NON-NLS-1$
-// ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-// genericDelete.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-// genericDelete.setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
-// genericDelete.setWorkbenchSite(viewPart.getViewSite());
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#setActionContext(org.eclipse.ui.actions.ActionContext)
- */
- public void setActionContext(ActionContext aContext) {
- if (aContext.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
-
- openAction.selectionChanged(selection);
- renameAction.selectionChanged(selection);
-
- Object[] array = selection.toArray();
- if (isUtilityJars(array)) {
- J2EEUtilityJarItemProvider utilityJarItemProvider = null;
- List newSelection = new ArrayList();
- for (int i = 0; i < array.length; i++) {
- utilityJarItemProvider = (J2EEUtilityJarItemProvider) array[i];
- newSelection.addAll(utilityJarItemProvider.getChildren(null));
- }
- selection = new StructuredSelection(newSelection);
- }
- //genericDelete.selectionChanged(genericDelete, selection);
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillActionBars(org.eclipse.ui.IActionBars)
- */
- public boolean fillActionBars(IActionBars theActionBars) {
-// if (genericDelete.isEnabled())
-// theActionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), genericDelete);
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager)
- */
- public boolean fillContextMenu(IMenuManager aMenu) {
- boolean actionsAdded = false;
- /* if (renameAction.isEnabled()) {
- aMenu.appendToGroup(ICommonMenuConstants.COMMON_MENU_EDIT_ACTIONS, renameAction);
- actionsAdded = true;
- }
- if (genericDelete.isEnabled()) {
- aMenu.appendToGroup(ICommonMenuConstants.COMMON_MENU_EDIT_ACTIONS, genericDelete);
- actionsAdded = true;
- }*/
- return actionsAdded;
- }
-
- private boolean isUtilityJars(Object[] items) {
- if (items != null) {
- for (int i = 0; i < items.length; i++) {
- if (items[i] == null || items[i].getClass() != J2EEUtilityJarItemProvider.class)
- return false;
- }
- return true;
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java
deleted file mode 100644
index 33d2ab6..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 22, 2005
- *
- * TODO To change the template for this generated file go to Window - Preferences - Java - Code
- * Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.Comparator;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-
-
-public class J2EEComparator implements Comparator {
-
- private J2EEViewerSorter j2eeViewSorter = new J2EEViewerSorter();
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(Object o1, Object o2) {
- J2EEJavaClassProviderHelper providerHelperLeftArg = null;
- J2EEJavaClassProviderHelper providerHelperRightArg = null;
-
- if (o1 instanceof J2EEJavaClassProviderHelper)
- providerHelperLeftArg = (J2EEJavaClassProviderHelper) o1;
- if (o2 instanceof J2EEJavaClassProviderHelper)
- providerHelperRightArg = (J2EEJavaClassProviderHelper) o2;
-
-
- /* if both arguments are J2EEJavaClassProviderHelpers */
- if (providerHelperLeftArg != null && providerHelperRightArg != null)
- return providerHelperLeftArg.getText().compareTo(providerHelperRightArg.getText());
- /* if exactly one of the arguments are J2EEJavaClassProviderHelpers */
- else if (providerHelperLeftArg != null && o2 instanceof EnterpriseBean)
- return 1;
- else if (providerHelperRightArg != null && o1 instanceof EnterpriseBean)
- return -1;
- return j2eeViewSorter.compare(null, o1, o2);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return obj instanceof J2EEComparator;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java
deleted file mode 100644
index c042b15..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java
+++ /dev/null
@@ -1,219 +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.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-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.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.provider.MethodsProviderDelegate;
-import org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectProvider.IRefreshHandlerListener;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.common.navigator.internal.provisional.views.CommonViewer;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class J2EEContentProvider implements ITreeContentProvider, IRefreshHandlerListener {
-
- private static final Class IPROJECT_CLASS = IProject.class;
-
- private final EMFRootObjectProvider rootObjectProvider;
-
- private AdapterFactoryContentProvider delegateContentProvider;
- private MethodsProviderDelegate delegateMethodsProvider;
-
- private String viewerId = null;
- Viewer viewer;
-
- /**
- *
- */
- public J2EEContentProvider() {
- rootObjectProvider = new EMFRootObjectProvider();
- rootObjectProvider.addRefreshHandlerListener(this);
- }
-
- /**
- *
- */
- public J2EEContentProvider(String aViewerId) {
- rootObjectProvider = new EMFRootObjectProvider();
- updateContentProviders(aViewerId);
- rootObjectProvider.addRefreshHandlerListener(this);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object anInputElement) {
- return getChildren(anInputElement);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#getChildren(java.lang.Object)
- */
- public Object[] getChildren(Object aParentElement) {
- IProject project = null;
- List children = new ArrayList();
- if (aParentElement instanceof IProject || aParentElement instanceof IJavaProject) {
- project = (IProject) ((IAdaptable) aParentElement).getAdapter(IPROJECT_CLASS);
- if (project != null) {
- Object[] rootObjects = (rootObjectProvider != null) ? rootObjectProvider.getModels(project) : null;
- if (rootObjects != null) {
- for (int x=0; x< rootObjects.length ; ++x) {
- children.add(rootObjects[x]);
- }
-
- }
- }
- } else if (MethodsProviderDelegate.providesContentFor(aParentElement))
- return delegateMethodsProvider.getChildren(aParentElement);
- else /* if (isEMFEditObject(aParentElement)) */{
- Object[] siblings = delegateContentProvider.getChildren(aParentElement);
- if (siblings != null)
- children.addAll(Arrays.asList(siblings));
- }
- return children.toArray();
- }
-
- public Object getParent(Object object) {
- if (MethodsProviderDelegate.providesContentFor(object))
- return delegateMethodsProvider.getParent(object);
- Object parent = delegateContentProvider.getParent(object);
- if (parent == null && object instanceof BeanClassProviderHelper)
- parent = ((BeanClassProviderHelper) object).getEjb();
- if (parent == null && object instanceof EObject)
- parent = ProjectUtilities.getProject((EObject) object);
- return parent;
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- rootObjectProvider.removeRefreshHandlerListener(this);
- delegateContentProvider.dispose();
- rootObjectProvider.dispose();
- delegateMethodsProvider.dispose();
-
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- if (MethodsProviderDelegate.providesContentFor(element))
- return delegateMethodsProvider.hasChildren(element);
- /* else if (isEMFEditObject(element)) */
- return delegateContentProvider.hasChildren(element);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer aViewer, Object anOldInput, Object aNewInput) {
- String newViewerId = null;
- viewer = aViewer;
- if (aViewer instanceof CommonViewer)
- newViewerId = ((CommonViewer) aViewer).getNavigatorContentService().getViewerId();
-
- if (newViewerId != null && (viewerId == null || !viewerId.equals(newViewerId)))
- updateContentProviders(newViewerId);
-
- delegateContentProvider.inputChanged(aViewer, anOldInput, aNewInput);
- delegateMethodsProvider.inputChanged(aViewer, anOldInput, aNewInput);
- }
-
- /**
- * @param viewerId2
- */
- private void updateContentProviders(String aViewerId) {
-
- /* Dispose of the existing content providers */
- if (delegateContentProvider != null)
- delegateContentProvider.dispose();
- if (delegateMethodsProvider != null)
- delegateMethodsProvider.dispose();
-
- /* Create new content providers using the new viewer id */
- DynamicAdapterFactory adapterFactory = new DynamicAdapterFactory(aViewerId);
- delegateContentProvider = new CommonAdapterFactoryContentProvider(adapterFactory);
- delegateMethodsProvider = new MethodsProviderDelegate(adapterFactory);
-
- /* Remember the viewer id */
- viewerId = aViewerId;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectManager.IRefreshHandlerListener#onRefresh(java.lang.Object)
- */
- public void onRefresh(final Object element) {
- if (viewer instanceof AbstractTreeViewer) {
- if (Display.getCurrent() != null) {
- ((AbstractTreeViewer) viewer).refresh(element, true);
- } else {
- /* Create and schedule a UI Job to update the Navigator Content Viewer */
- Job job = new UIJob("Update the Navigator Content Viewer Job") { //$NON-NLS-1$
- public IStatus runInUIThread(IProgressMonitor monitor) {
- ((AbstractTreeViewer) viewer).refresh(element, true);
- return Status.OK_STATUS;
- }
- };
- ISchedulingRule rule = new ISchedulingRule() {
- public boolean contains(ISchedulingRule rule) {
- return rule == this;
- }
- public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
- }
- };
- if (rule != null) {
- job.setRule(rule);
- }
- job.schedule();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
deleted file mode 100644
index 1646d37..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
+++ /dev/null
@@ -1,233 +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.jst.j2ee.navigator.internal;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.common.navigator.internal.provisional.views.ICommonLabelProvider;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class J2EELabelProvider implements ICommonLabelProvider {
-
- private AdapterFactoryLabelProvider delegateLabelProvider;
-
- /**
- *
- */
- public J2EELabelProvider() {
- super();
- }
-
- /**
- *
- */
- public J2EELabelProvider(String aViewerId) {
- super();
- initialize(aViewerId);
- }
-
- public void initialize(String aViewerId) {
- delegateLabelProvider = new AdapterFactoryLabelProvider(new DynamicAdapterFactory(aViewerId));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.extensions.ICommonLabelProvider#getDescription(java.lang.Object)
- */
- public String getDescription(Object anElement) {
- if (anElement instanceof EObject) {
- EObject eObj = (EObject) anElement;
- if (CommonUtil.isDeploymentDescriptorRoot(eObj, true /* include ears */)) {
- IProject parent = ProjectUtilities.getProject(eObj);
- String path = new Path(eObj.eResource().getURI().toString()).makeRelative().toString();
- if (parent == null)
- return path;
- int startIndex = path.indexOf(parent.getFullPath().toString());
- return -1 == startIndex ? path : path.substring(startIndex);
- }
- }
- return null;
- }
-
- /**
- * @param listener
- */
- public void addListener(ILabelProviderListener listener) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.addListener(listener);
- }
-
- /**
- *
- */
- public void dispose() {
- if (delegateLabelProvider != null)
- delegateLabelProvider.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.equals(obj);
- return false;
- }
-
- /**
- *
- */
- public void fireLabelProviderChanged() {
- if (delegateLabelProvider != null)
- delegateLabelProvider.fireLabelProviderChanged();
- }
-
- /**
- * @return
- */
- public AdapterFactory getAdapterFactory() {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getAdapterFactory();
- return null;
- }
-
- /**
- * @param object
- * @param columnIndex
- * @return
- */
- public Image getColumnImage(Object object, int columnIndex) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getColumnImage(object, columnIndex);
- return null;
- }
-
- /**
- * @param object
- * @param columnIndex
- * @return
- */
- public String getColumnText(Object object, int columnIndex) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getColumnText(object, columnIndex);
- return null;
- }
-
- /**
- * @param element
- * @return
- */
- public Image getImage(Object element) {
-
- if(element instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) element).getImage();
- if (element instanceof File)
- return J2EEUIPlugin.getDefault().getImage("jar_obj");
- if (element instanceof IProject)
- return null;
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getImage(element);
- return null;
- }
-
- /**
- * @param element
- * @return
- */
- public String getText(Object element) {
- if(element instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) element).getText();
- if (element instanceof File)
- return ((File)element).getName();
- if (element instanceof IProject)
- return ((IProject)element).getName();
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getText(element);
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.hashCode();
- return super.hashCode();
- }
-
- /**
- * @param object
- * @param id
- * @return
- */
- public boolean isLabelProperty(Object object, String id) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.isLabelProperty(object, id);
- return false;
- }
-
- /**
- * @param notification
- */
- public void notifyChanged(Notification notification) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.notifyChanged(notification);
- }
-
- /**
- * @param listener
- */
- public void removeListener(ILabelProviderListener listener) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.removeListener(listener);
- }
-
- /**
- * @param adapterFactory
- */
- public void setAdapterFactory(AdapterFactory adapterFactory) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.setAdapterFactory(adapterFactory);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.toString();
- return super.toString();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java
deleted file mode 100644
index 0820d93..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java
+++ /dev/null
@@ -1,33 +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
- *******************************************************************************/
-/*
- * Created on Nov 21, 2003
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider;
-
-/**
- * @author Administrator
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EENavigationLabelProvider extends J2EEAdapterFactoryLabelProvider {
-
- public J2EENavigationLabelProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java
deleted file mode 100644
index 0ac695f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.navigator.internal;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-public class J2EEViewerSorter extends ViewerSorter {
-
- /**
- * Constructor for J2EEViewerSorter.
- */
- public J2EEViewerSorter() {
- super();
- }
-
-
-
- /**
- * @see ViewerSorter#compare(Viewer, Object, Object)
- */
- public int compare(Viewer viewer, Object e1, Object e2) {
- if (shouldSort(e1, e2))
- return super.compare(viewer, e1, e2);
- return 0;
- }
-
- protected boolean isEnterpriseBean(Object o) {
- return o instanceof EnterpriseBean;
- }
-
- protected boolean isDeploymentDescriptorRoot(Object o) {
- return CommonUtil.isDeploymentDescriptorRoot(o);
- }
-
- protected boolean shouldSort(Object e1, Object e2) {
- return (isDeploymentDescriptorRoot(e1) && isDeploymentDescriptorRoot(e2)) || (isEnterpriseBean(e1) && isEnterpriseBean(e2)) || ((e1 instanceof IFile) && (e2 instanceof IFile));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java
deleted file mode 100644
index 221299c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class NonFlexibleEMFModelManager extends EMFModelManager implements EditModelListener{
-
- private EditModel editModel;
- private Object rootObject;
- private static final Object[] EMPTY_OBJECT = new Object[0];
- /**
- * @param aProject
- * @param provider
- */
- public NonFlexibleEMFModelManager(IProject aProject, EMFRootObjectProvider provider) {
- super(aProject, provider);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#getModels()
- */
- public Object[] getModels() {
- // TODO Auto-generated method stub
- if (getProject() == null || !getProject().isAccessible())
- return EMPTY_OBJECT;
-
- //synchronized (rootObject) {
- if (rootObject == null || ((EObject) rootObject).eResource() == null) {
- EditModel editModel = getEditModel();
- if (editModel != null) {
- rootObject = editModel.getPrimaryRootObject();
- }
- }
- //}
- if (rootObject==null)
- return EMPTY_OBJECT;
- else {
- Object[] objects = new Object[1];
- objects[0] = rootObject;
- return objects;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#dispose()
- */
- public void dispose() {
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- editModel = null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- IProject affectedProject = anEvent.getEditModel().getProject();
- switch (anEvent.getEventCode()) {
- case EditModelEvent.UNLOADED_RESOURCE :
- case EditModelEvent.REMOVED_RESOURCE :
- if (rootObject != null){
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.SAVE : {
- if (rootObject == null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.PRE_DISPOSE :
- dispose();
- break;
- default :
- break;
- }
-
- }
-
-
-
- protected EditModel getEditModel() {
- IProject project = getProject();
- if (project == null)
- return null;
-
- //TODO fix up
- //synchronized (editModel) {
-// if (editModel == null && project.isAccessible()) {
-// //System.out.println("getEditModelForProject " + project.getName());
-// J2EENature nature = J2EENature.getRegisteredRuntime(project);
-// if (nature != null) {
-// editModel = nature.getJ2EEEditModelForRead(this);
-// if (editModel != null) {
-// editModel.addListener(this);
-// }
-// }
-// }
- //}
- return editModel;
- }
-
- protected void disposeCache(IProject affectedProject) {
- //synchronized (editModel) {
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- editModel = null;
- }
- //}
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java
deleted file mode 100644
index 1a516b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java
+++ /dev/null
@@ -1,51 +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.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter;
-import org.eclipse.wst.common.navigator.internal.workbench.ResourceDropAction;
-
-/**
- * @author mdelder
- *
- */
-public class AddExternalUtilityJarDropAction extends ResourceDropAction {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.workbench.navigator.dnd.ResourceDropAction#validateDrop(org.eclipse.wst.common.navigator.internal.views.navigator.dnd.CommonNavigatorDropAdapter,
- * java.lang.Object, int, org.eclipse.swt.dnd.TransferData)
- */
- public boolean validateDrop(CommonNavigatorDropAdapter dropAdapter, Object target, int operation, TransferData transferType) {
- //TODO redo with components
-// if (FileTransfer.getInstance().isSupportedType(transferType)) {
-// IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
-// try {
-// if (project.hasNature(IEARNatureConstants.NATURE_ID)) {
-// String[] sourceNames = (String[]) FileTransfer.getInstance().nativeToJava(transferType);
-// if (sourceNames == null)
-// return true;
-//
-// boolean result = true;
-// for (int i = 0; i < sourceNames.length; i++)
-// if (!(result = sourceNames[0].endsWith(".jar")))break; //$NON-NLS-1$
-// return result;
-// }
-// return false;
-// } catch (CoreException e) {
-// return false;
-// }
-// }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java
deleted file mode 100644
index fefcd70..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java
+++ /dev/null
@@ -1,41 +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.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author mdelder
- *
- */
-public class AddModuleDropAction extends AddProjectToEarDropAction {
-
- public AddModuleDropAction() {
- super();
- }
-
- protected boolean validateProjectToAdd(IProject projectToAdd, int earVersion) {
- //TODO fix up to use components
-// J2EENature moduleNature = J2EENature.getRegisteredRuntime(projectToAdd);
-// if (null == moduleNature || moduleNature.getNatureID().equals(IEARNatureConstants.NATURE_ID) || moduleNature.getJ2EEVersion() > earVersion) {
-// return false;
-// }
- return true;
- }
-
- protected IDataModel getDataModel(IProject earProject, IProject projectToAdd) {
- //TODO fix up to use components
-// return AddModuleToEARDataModel.createAddToEARDataModel(null,null);
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java
deleted file mode 100644
index 3ed68ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java
+++ /dev/null
@@ -1,123 +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.jst.j2ee.navigator.internal.dnd;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-import org.eclipse.wst.common.navigator.internal.views.NavigatorPlugin;
-import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter;
-import org.eclipse.wst.common.navigator.internal.views.dnd.IDropValidator;
-import org.eclipse.wst.common.navigator.internal.views.dnd.NavigatorDropActionDelegate;
-
-/**
- * @author jsholl
- *
- */
-public abstract class AddProjectToEarDropAction extends NavigatorDropActionDelegate implements IDropValidator {
-
- public AddProjectToEarDropAction() {
- super();
- }
-
- public boolean validateDrop(CommonNavigatorDropAdapter dropAdapter, Object target, int operation, TransferData transferType) {
- return false;
- //TODO switch to components
-// if (LocalSelectionTransfer.getInstance().isSupportedType(transferType) || PluginTransfer.getInstance().isSupportedType(transferType)) {
-// IProject earProject = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
-// if (null == earProject || !earProject.isAccessible()) {
-// return false;
-// }
-//
-// int earVersion = earNature.getApplication().getJ2EEVersionID();
-//
-// ISelection selection = LocalSelectionTransfer.getInstance().getSelection();
-// if (selection == null || !(selection instanceof IStructuredSelection)) {
-// return false;
-// }
-// IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-// if (structuredSelection.isEmpty()) {
-// return false;
-// }
-// Object key = new Object();
-// EAREditModel editModel = null;
-// try {
-// editModel = earNature.getEarEditModelForRead(key);
-// Iterator iterator = structuredSelection.iterator();
-// while (iterator.hasNext()) {
-// Object next = iterator.next();
-// IProject projectToAdd = (IProject) AdaptabilityUtility.getAdapter(next, IProject.class);
-// if (null == projectToAdd || !projectToAdd.isAccessible()) {
-// return false;
-// }
-//
-// if (!validateProjectToAdd(projectToAdd, earVersion)) {
-// return false;
-// }
-//
-// if (editModel.hasMappingToProject(projectToAdd)) {
-// return false;
-// }
-// }
-// } finally {
-// if (null != editModel) {
-// editModel.releaseAccess(key);
-// }
-// }
-// return true;
-// }
-// return false;
- }
-
- protected abstract boolean validateProjectToAdd(IProject projectToAdd, int earVersion);
-
- protected abstract IDataModel getDataModel(IProject earProject, IProject projectToAdd);
-
- protected void doInit() {
- //default nothing
- }
-
- public boolean run(Object source, Object target) {
- if (source instanceof IStructuredSelection)
- return run((IStructuredSelection) source, (IProject) AdaptabilityUtility.getAdapter(target, IProject.class));
- return false;
- }
-
- public boolean run(CommonNavigatorDropAdapter dropAdapter, Object source, Object target) {
- return run(source, target);
- }
-
- protected boolean run(IStructuredSelection selection, IProject earProject) {
- if (selection == null || selection.isEmpty() || earProject == null || !earProject.isAccessible())
- return false;
-
- for (Iterator selectionIterator = selection.iterator(); selectionIterator.hasNext();) {
- Object sourceObject = selectionIterator.next();
-
- IProject projectToAdd = (IProject) AdaptabilityUtility.getAdapter(sourceObject, IProject.class);
- if (projectToAdd != null) {
- try {
- IDataModel dataModel = getDataModel(earProject, projectToAdd);
- dataModel.getDefaultOperation().execute(new NullProgressMonitor(),null);
- } catch (Exception e) {
- NavigatorPlugin.log(e.toString());
- }
- }
- }
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java
deleted file mode 100644
index 11b7dbd..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java
+++ /dev/null
@@ -1,53 +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
- *******************************************************************************/
-/*
- * Created on Jun 9, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.internal.wizard.ServerTargetUIHelper;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author jsholl
- *
- */
-public class AddUtilityJarDropAction extends AddProjectToEarDropAction {
-
- public AddUtilityJarDropAction() {
- super();
- }
-
- protected boolean validateProjectToAdd(IProject projectToAdd, int earVersion) {
- try {
- return projectToAdd.hasNature(JavaCore.NATURE_ID);
- } catch (CoreException e) {
- //Ignore
- }
- return false;
- }
-
- protected IDataModel getDataModel(IProject earProject, IProject projectToAdd) {
- //TODO migrate to AddComponentToEnterpriseApplicationDataModelProvider
- IDataModel dataModel = null;
- boolean syncServerTarget = ServerTargetUIHelper.setModuleServerTargetIfNecessary(earProject, projectToAdd, getShell());
-// dataModel = AddUtilityProjectToEARDataModel.createAddToEARDataModel(earProject.getName(), projectToAdd);
-// dataModel.setBooleanProperty(AddArchiveToEARDataModel.SYNC_TARGET_RUNTIME, syncServerTarget);
- return dataModel;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java
deleted file mode 100644
index edc7fbb..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java
+++ /dev/null
@@ -1,247 +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
- *******************************************************************************/
-/*
- * Created on May 6, 2004
- *
- */
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.ImportUtil;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter;
-import org.eclipse.wst.common.navigator.internal.views.dnd.IDropValidator;
-import org.eclipse.wst.common.navigator.internal.views.dnd.NavigatorDropActionDelegate;
-
-/**
- * @author jsholl
- *
- */
-public class J2EEImportDropAction extends NavigatorDropActionDelegate implements IDropValidator {
- private ArchiveOptions readOnlyArchiveOptions;
-
- public J2EEImportDropAction() {
- readOnlyArchiveOptions = new ArchiveOptions();
- readOnlyArchiveOptions.setIsReadOnly(true);
- }
-
- private boolean fileExistsOnDisk(String fileName) {
- if (fileName != null && fileName.length() > 0) {
- java.io.File file = new java.io.File(fileName);
- return file.exists() && !file.isDirectory();
- }
- return false;
- }
-
- public boolean validateDrop(CommonNavigatorDropAdapter dropAdapter, Object target, int operation, TransferData transferType) {
- if (FileTransfer.getInstance().isSupportedType(transferType)) {
- String[] sourceNames = (String[]) FileTransfer.getInstance().nativeToJava(transferType);
- if (sourceNames == null || sourceNames.length != 1) { //only handle one file for now
- return false;
- }
- String fileName = sourceNames[0];
- if (!(fileName.endsWith(".ear") || fileName.endsWith(".jar") || fileName.endsWith(".war") || fileName.endsWith(".rar"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return false;
- }
- if (!fileExistsOnDisk(fileName)) {
- return false;
- }
- int archiveType = ImportUtil.UNKNOWN;
- Archive archive = null;
- try {
-// archive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
-// archiveType = ImportUtil.getArchiveType(archive);
-// String[] possibleNatures = null;
-// switch (archiveType) {
-// case ImportUtil.EARFILE :
-// possibleNatures = new String[]{IEARNatureConstants.NATURE_ID};
-// break;
-// case ImportUtil.EJBJARFILE :
-// possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IEJBNatureConstants.NATURE_ID};
-// break;
-// case ImportUtil.CLIENTJARFILE :
-// possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IApplicationClientNatureConstants.NATURE_ID};
-// break;
-// case ImportUtil.WARFILE :
-// possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IWebNatureConstants.J2EE_NATURE_ID};
-// break;
-// case ImportUtil.RARFILE :
-// possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IConnectorNatureConstants.NATURE_ID};
-// break;
-// default :
-// return false;
-// }
-//
-// IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
- //TODO fix up to use components and artifact edits
-// if (null != project) {
-// try {
-// boolean foundNature = false;
-// for (int i = 0; !foundNature && i < possibleNatures.length; i++) {
-// if (project.hasNature(possibleNatures[i])) {
-// foundNature = true;
-// J2EENature nature = (J2EENature) project.getNature(possibleNatures[i]);
-// int projectJ2EEVersion = nature.getJ2EEVersion();
-// int archiveModuleVersion = ArchiveUtil.getFastSpecVersion((ModuleFile) archive);
-// boolean fail = false;
-// switch (archiveType) {
-// case ImportUtil.EARFILE :
-// case ImportUtil.CLIENTJARFILE :
-// if (projectJ2EEVersion < archiveModuleVersion) {
-// fail = true;
-// }
-// break;
-// case ImportUtil.EJBJARFILE :
-// if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_2_ID && archiveModuleVersion > J2EEVersionConstants.EJB_1_1_ID) {
-// fail = true;
-// } else if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_3_ID && archiveModuleVersion > J2EEVersionConstants.EJB_2_0_ID) {
-// fail = true;
-// }
-// break;
-// case ImportUtil.WARFILE :
-// if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_2_ID && archiveModuleVersion > J2EEVersionConstants.WEB_2_2_ID) {
-// fail = true;
-// } else if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_3_ID && archiveModuleVersion > J2EEVersionConstants.WEB_2_3_ID) {
-// fail = true;
-// }
-// break;
-// case ImportUtil.RARFILE :
-// if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_2_ID) {
-// fail = true;
-// } else if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_3_ID && archiveModuleVersion > J2EEVersionConstants.JCA_1_0_ID) {
-// fail = true;
-// }
-// break;
-// }
-// if (fail) {
-// return false;
-// }
-// return true;
-// }
-// }
-// if (!foundNature) {
-// return false;
-// }
-// } catch (CoreException e) {
-// return false;
-// }
-// }
-
- } catch (Exception e) {
- return false;
- } finally {
- if (null != archive && archive.isOpen()) {
- archive.close();
- }
- }
- return true;
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.NavigatorDropActionDelegate#run(org.eclipse.wst.common.navigator.internal.views.navigator.dnd.CommonNavigatorDropAdapter,
- * java.lang.Object, java.lang.Object)
- */
- public boolean run(CommonNavigatorDropAdapter dropAdapter, Object source, Object target) {
- TransferData currentTransfer = dropAdapter.getCurrentTransfer();
- if (FileTransfer.getInstance().isSupportedType(currentTransfer)) {
- final String[] fileNames = (String[]) source;
- final String fileName = fileNames[0];
- DataModelWizard wizard = null;
- IDataModel dataModel = null;
-
- int archiveType = ImportUtil.UNKNOWN;
- Archive archive = null;
- try {
- archive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
- archiveType = ImportUtil.getArchiveType(archive);
- switch (archiveType) {
- case ImportUtil.EARFILE :
- dataModel = null;//new EnterpriseApplicationImportDataModel();
- break;
- case ImportUtil.EJBJARFILE :
- dataModel = null;//new EJBModuleImportDataModel();
- break;
- case ImportUtil.CLIENTJARFILE :
- dataModel = null;//new AppClientModuleImportDataModel();
- break;
- case ImportUtil.WARFILE :
- dataModel = null;//new WebModuleImportDataModel();
- break;
- case ImportUtil.RARFILE :
- dataModel = null;//new ConnectorModuleImportDataModel();
- break;
- default :
- return false;
- }
- } catch (OpenFailureException e) {
- return false;
- } finally {
- if (null != archive && archive.isOpen()) {
- archive.close();
- }
- }
-
- dataModel.setProperty(IJ2EEModuleImportDataModelProperties.FILE_NAME, fileName);
-
- IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
- if (null != project) {
- try {
- if (archiveType == ImportUtil.EARFILE ) {
- dataModel.setProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME, project.getName());
- } else {
- dataModel.setProperty(IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME, project.getName());
- dataModel.setBooleanProperty(IJ2EEModuleImportDataModelProperties.ADD_TO_EAR, true);
- }
- } catch (Exception e) {
- return false;
- }
- }
- switch (archiveType) {
- case ImportUtil.EARFILE :
- wizard = null;//new EnterpriseApplicationImportWizard((EnterpriseApplicationImportDataModel) dataModel);
- break;
- case ImportUtil.EJBJARFILE :
- wizard = null;//new EJBModuleImportWizard((EJBModuleImportDataModel) dataModel);
- break;
- case ImportUtil.CLIENTJARFILE :
- wizard = null;//new AppClientModuleImportWizard((AppClientModuleImportDataModel) dataModel);
- break;
- case ImportUtil.WARFILE :
- wizard = null;//new WebModuleImportWizard((WebModuleImportDataModel) dataModel);
- break;
- case ImportUtil.RARFILE :
- wizard = null;//new ConnectorModuleImportWizard((ConnectorModuleImportDataModel) dataModel);
- break;
- }
-
- if (null != wizard) {
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- dialog.open();
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java
deleted file mode 100644
index 6e7477f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java
+++ /dev/null
@@ -1,49 +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.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-import org.eclipse.wst.common.navigator.internal.views.dnd.ISerializer;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class ModuleIdentifierSerializer implements ISerializer {
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.ISerializer#toByteArray(java.lang.Object)
- */
- public byte[] toByteArray(Object data) {
- IProject project = (IProject) AdaptabilityUtility.getAdapter(data, IProject.class);
- if (project != null)
- return project.getName().getBytes();
- return null;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.ISerializer#fromByteArray(byte[])
- */
- public Object fromByteArray(byte[] data) {
- String name = new String(data);
- return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java
deleted file mode 100644
index d3d5680..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java
+++ /dev/null
@@ -1,47 +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.jst.j2ee.navigator.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class J2EENavigatorPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static J2EENavigatorPlugin plugin;
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.navigator.ui"; //$NON-NLS-1$
-
-
- /**
- * The constructor.
- */
- public J2EENavigatorPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static J2EENavigatorPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSet.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSet.java
deleted file mode 100644
index 88682db..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSet.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 24, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal.workingsets;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jst.common.navigator.internal.ui.workingsets.AbstractWorkingSetManager;
-import org.eclipse.jst.common.navigator.internal.ui.workingsets.ICommonWorkingSet;
-import org.eclipse.ui.IActionFilter;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetManager;
-import org.eclipse.ui.internal.IWorkbenchConstants;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.registry.WorkingSetDescriptor;
-import org.eclipse.ui.internal.registry.WorkingSetRegistry;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ComponentWorkingSet implements ICommonWorkingSet,IActionFilter{
-
- static final String FACTORY_ID = "org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory"; //$NON-NLS-1$
-
- private static final String COMPONENT_TYPE_ID = "componentTypeId"; //$NON-NLS-1$
-
- private static final String EDIT_PAGE_ID = "editPageId"; //$NON-NLS-1$
-
- public static final String COMPONENT_WORKING_SET_ID = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage";
-
- private String name;
-
- private String label;
-
- private ArrayList elements;
-
- private String editPageId;
-
- private IMemento workingSetMemento;
-
- private IWorkingSetManager manager;
-
- private String typeId;
-
- public static final String TAG_TYPE_ID = "typeId"; //$NON-NLS-1$
-
-
- /**
- * Creates a new working set.
- *
- * @param name the name of the new working set. Should not have
- * leading or trailing whitespace.
- * @param element the content of the new working set.
- * May be empty but not <code>null</code>.
- */
- public ComponentWorkingSet(String aName, IAdaptable[] elements) {
- name = aName;
- internalSetElements(elements);
-
- }
-
- /**
- * Creates a new working set from a memento.
- *
- * @param name the name of the new working set. Should not have
- * leading or trailing whitespace.
- * @param memento persistence memento containing the elements of
- * the working set.
- */
- ComponentWorkingSet(String aName, String aTypeId, IMemento memento) {
- name = aName;
- typeId = aTypeId;
- workingSetMemento = memento;
- internalSetElements(new IAdaptable[0]);
- }
-
- /**
- * @param descriptor2
- */
- public ComponentWorkingSet(ComponentWorkingSetDescriptor aDescriptor) {
- name = aDescriptor.getLabel();
- typeId = aDescriptor.getTypeId();
- editPageId = aDescriptor.getId();
- internalSetElements(new IAdaptable[0]);
- }
-
- /**
- * Tests the receiver and the object for equality
- *
- * @param object object to compare the receiver to
- * @return true=the object equals the receiver, the name is the same.
- * false otherwise
- */
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- }
- if (object instanceof ComponentWorkingSet) {
- ComponentWorkingSet workingSet = (ComponentWorkingSet) object;
- String objectPageId = workingSet.getId();
- String pageId = getId();
- boolean pageIdEqual = (objectPageId == null && pageId == null)
- || (objectPageId != null && objectPageId.equals(pageId));
- String objectTypeId = workingSet.getTypeId();
- String typeId = getTypeId();
- boolean typeIdEqual = (objectTypeId == null && typeId == null)
- || (objectTypeId != null && objectTypeId.equals(typeId));
- return workingSet.getName().equals(getName())
- && workingSet.getElementsArray().equals(getElementsArray())
- && pageIdEqual
- && typeIdEqual;
- }
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isEditable() {
- WorkingSetRegistry registry = WorkbenchPlugin.getDefault().getWorkingSetRegistry();
- String id= getId();
- if (id == null)
- return false;
- WorkingSetDescriptor descriptor= registry.getWorkingSetDescriptor(id);
- if (descriptor == null)
- return false;
- return descriptor.isEditable();
- }
-//
- /**
- * Returns the receiver if the requested type is either IWorkingSet
- * or IPersistableElement.
- *
- * @param adapter the requested type
- * @return the receiver if the requested type is either IWorkingSet
- * or IPersistableElement.
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IWorkingSet.class
- || adapter == IPersistableElement.class) {
- return this;
- }
- return InternalPlatform.getDefault().getAdapterManager().getAdapter(this, adapter);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSet
- */
- public IAdaptable[] getElements() {
- ArrayList list = getElementsArray();
- return (IAdaptable[]) list.toArray(new IAdaptable[list.size()]);
- }
-
- /**
- * Returns the elements array list. Lazily restores the elements from
- * persistence memento.
- *
- * @return the elements array list
- */
- private ArrayList getElementsArray() {
- if (elements == null) {
- restoreWorkingSet();
- workingSetMemento = null;
- }
- return elements;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPersistableElement
- */
- public String getFactoryId() {
- return FACTORY_ID;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSet
- */
- public String getId() {
- if (editPageId == null)
- editPageId = COMPONENT_WORKING_SET_ID;
- return editPageId;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSet
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the hash code.
- *
- * @return the hash code.
- */
- public int hashCode() {
- int hashCode = name.hashCode() & typeId.hashCode();
-
- if (editPageId != null) {
- hashCode &= editPageId.hashCode();
- }
- return hashCode;
- }
-
- /**
- * Recreates the working set elements from the persistence memento.
- */
- private void restoreWorkingSet() {
- //updateElements();
- }
-
- /**
- * Implements IPersistableElement.
- * Persist the working set name and working set contents.
- * The contents has to be either IPersistableElements or provide
- * adapters for it to be persistent.
- *
- * @see org.eclipse.ui.IPersistableElement#saveState(IMemento)
- */
- public void saveState(IMemento memento) {
- if (workingSetMemento != null) {
- // just re-save the previous memento if the working set has
- // not been restored
- memento.putMemento(workingSetMemento);
- } else {
- memento.putString(IWorkbenchConstants.TAG_NAME, getName());
- memento.putString(IWorkbenchConstants.TAG_EDIT_PAGE_ID, getId());
- memento.putString(TAG_TYPE_ID,typeId);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSet
- */
- public void setElements(IAdaptable[] newElements) {
- internalSetElements(newElements);
- fireWorkingSetChanged(IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE, null);
- }
-
- /**
- * Create a copy of the elements to store in the receiver.
- *
- * @param elements the elements to store a copy of in the
- * receiver.
- */
- private void internalSetElements(IAdaptable[] newElements) {
- Assert.isNotNull(newElements,
- "Working set elements array must not be null"); //$NON-NLS-1$
-
- elements = new ArrayList(newElements.length);
- for (int i = 0; i < newElements.length; i++) {
- elements.add(newElements[i]);
- }
- }
-//
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSet
- */
- public void setId(String pageId) {
- editPageId = pageId;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSet
- */
- public void setName(String newName) {
- Assert.isNotNull(newName, "Working set name must not be null"); //$NON-NLS-1$
-
- name = newName;
- fireWorkingSetChanged(IWorkingSetManager.CHANGE_WORKING_SET_NAME_CHANGE, null);
- }
-
- public void connect(IWorkingSetManager manager) {
- Assert.isTrue(this.manager == null, "A working set can only be connected to one manager"); //$NON-NLS-1$
- this.manager= manager;
- }
-
- public void disconnect() {
- this.manager= null;
-
- }
-
-
- private void fireWorkingSetChanged(String property, Object oldValue) {
- AbstractWorkingSetManager receiver= manager != null
- ? (AbstractWorkingSetManager)manager
- : (AbstractWorkingSetManager)WorkbenchPlugin.getDefault().getWorkingSetManager();
- receiver.workingSetChanged(this, property, oldValue);
- }
-
-
-
- public ImageDescriptor getImage() {
- ComponentWorkingSetRegistry registry = ComponentWorkingSetRegistry.getInstance();
- ComponentWorkingSetDescriptor descriptor = null;
-
- descriptor = registry.getWorkingSetDescriptor(getId(), typeId);
- if (descriptor == null) {
- return null;
- }
- return descriptor.getIcon();
-
- }
-
- public String getTypeId() {
- return typeId;
- }
-
-
-
-
-
- public boolean testAttribute(Object target, String name, String value) {
- if (COMPONENT_TYPE_ID.equals(name))
- return getTypeId().equals(value);
- if (EDIT_PAGE_ID.equals(name))
- return getId().equals(value);
-
- return false;
-
- }
-
- public boolean isVisible() {
- //TODO_32 This implementation put in WTP 1.0 to maintain compatibility with Eclipse 3.2 M3
- return true;
- }
-
- public String getLabel() {
- //TODO_32 This implementation put in WTP 1.0 to maintain compatibility with Eclipse 3.2 M3
- String result = label;
- if (result == null) {
- result = getName();
- }
- return result;
- }
-
- public void setLabel(String label) {
- //TODO_32 This implementation put in WTP 1.0 to maintain compatibility with Eclipse 3.2 M3
- this.label = label;
-
- }
-
- public boolean isSelfUpdating() {
- // TODO_32 this method was added to be compatible
- // with 3.2. Please reimplenet it in the 32 stream if needed.
- return false;
- }
-
- public boolean isAggregateWorkingSet() {
- // TODO_32 this method was added to be compatible
- // with 3.2. Please reimplenet it in the 32 stream if needed.
- return false;
- }
-
- public boolean isEmpty() {
- // TODO_32 this method was added to be compatible
- // with 3.2. Please reimplenet it in the 32 stream if needed.
- return false;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetDescriptor.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetDescriptor.java
deleted file mode 100644
index 16097bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetDescriptor.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 23, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal.workingsets;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ComponentWorkingSetDescriptor {
-
- private IConfigurationElement configElement;
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_LABEL = "label"; //$NON-NLS-1$
- public static final String ATT_ICON = "icon"; //$NON-NLS-1$
- public static final String ATT_MODULE_TYPE = "typeId"; //$NON-NLS-1$
-
- private String id ;
- private String label ;
- private String icon;
- private String typeId;
-
-
- /**
- * @param anElement
- */
- public ComponentWorkingSetDescriptor(IConfigurationElement aConfigElement) throws WorkbenchException{
- super();
- configElement = aConfigElement;
- init();
- }
-
- void init() throws WorkbenchException {
- label = configElement.getAttribute(ATT_LABEL);
- id = configElement.getAttribute(ATT_ID);
- typeId = configElement.getAttribute(ATT_MODULE_TYPE);
- icon = configElement.getAttribute(ATT_ICON);
-
- if (id == null || id.length() == 0) {
- throw new WorkbenchException("Missing attribute: " + //$NON-NLS-1$
- ATT_ID + " in common working set extension: " + //$NON-NLS-1$
- configElement.getDeclaringExtension().getUniqueIdentifier());
- }
-
- if (label == null || label.length() == 0) {
- throw new WorkbenchException("Missing attribute: " + //$NON-NLS-1$
- ATT_LABEL + " in common working set extension: " + //$NON-NLS-1$
- configElement.getDeclaringExtension().getUniqueIdentifier());
- }
-
- if (typeId == null || typeId.length() == 0) {
- throw new WorkbenchException("Missing attribute: " + //$NON-NLS-1$
- ATT_MODULE_TYPE + " in common working set extension: " + //$NON-NLS-1$
- configElement.getDeclaringExtension().getUniqueIdentifier());
- }
- }
-
- /**
- * @return
- */
- public String getTypeId() {
- // TODO Auto-generated method stub
- return typeId;
- }
-
- public String getId() {
- // TODO Auto-generated method stub
- return id;
- }
-
- /**
- * @return
- */
- public String getLabel() {
- // TODO Auto-generated method stub
- return label;
- }
-
- /**
- * Returns the page's icon
- *
- * @return the page's icon
- */
- public ImageDescriptor getIcon() {
- if (icon == null)
- return null;
-
- IExtension extension = configElement.getDeclaringExtension();
- String extendingPluginId = extension.getNamespace();
- return AbstractUIPlugin.imageDescriptorFromPlugin(extendingPluginId,
- icon);
- }
-
- /**
- * @throws BundleException
- *
- */
-// public void start() throws BundleException {
-// Bundle bundle= Platform.getBundle(configElement.getDeclaringExtension().getNamespace());
-// if ( bundle.getState() != Bundle.ACTIVE )
-// bundle.start();
-//
-// }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetFactory.java
deleted file mode 100644
index 305412e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 28, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal.workingsets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ui.IElementFactory;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.internal.IWorkbenchConstants;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ComponentWorkingSetFactory implements IElementFactory {
-
- /**
- *
- */
- public ComponentWorkingSetFactory() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IElementFactory
- */
- public IAdaptable createElement(IMemento memento) {
- String workingSetName = memento.getString(IWorkbenchConstants.TAG_NAME);
- String typeId = memento.getString(ComponentWorkingSet.TAG_TYPE_ID);
- String workingSetEditPageId = memento
- .getString(IWorkbenchConstants.TAG_EDIT_PAGE_ID);
-
- if (workingSetName == null)
- return null;
-
- ComponentWorkingSet workingSet = new ComponentWorkingSet(workingSetName, typeId, memento);
- if (workingSetEditPageId != null) {
- workingSet.setId(workingSetEditPageId);
- } else {
- // working sets created with builds 20020418 and 20020419 will not
- // have an edit page id. fix this automatically.
- workingSet.setId(ComponentWorkingSet.COMPONENT_WORKING_SET_ID); //$NON-NLS-1$
- }
- return workingSet;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetProvider.java
deleted file mode 100644
index 1346147..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal.workingsets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.common.navigator.internal.ui.workingsets.ICommonWorkingSetProvider;
-import org.eclipse.ui.IWorkingSet;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ComponentWorkingSetProvider implements ICommonWorkingSetProvider {
-
- private static final ComponentWorkingSetRegistry COMPONENT_WORKING_SET_REGISTRY = ComponentWorkingSetRegistry.getInstance();
- boolean bInitialized = false;
- List workingSets = new ArrayList();
- /**
- *
- */
- public ComponentWorkingSetProvider() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.common.navigator.internal.ui.workingsets.IWorkingSetProvider#getWorkingSets()
- */
- public IWorkingSet[] getWorkingSets() {
- if (!bInitialized) {
- //workingSets.clear();
- synchronized (workingSets) {
- ComponentWorkingSetDescriptor[] set = COMPONENT_WORKING_SET_REGISTRY.getComponentWorkingSetDescriptors();
- ComponentWorkingSetDescriptor descriptor = null;
- IWorkingSet workingSet = null;
- for (int x=0; x<set.length;++ x) {
- descriptor = set[x];
- workingSet= new ComponentWorkingSet(descriptor);
- workingSets.add(workingSet);
- bInitialized = true;
- }
- }
- }
-
- IWorkingSet[] ws = new IWorkingSet[workingSets.size()];
- return (IWorkingSet[])workingSets.toArray(ws);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.common.navigator.internal.ui.workingsets.IWorkingSetProvider#init(org.eclipse.jst.common.navigator.internal.ui.workingsets.WorkingSetModel)
- */
-// public void init(WorkingSetModel workingSetModel) {
-// // TODO Auto-generated method stub
-
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetRegistry.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetRegistry.java
deleted file mode 100644
index 7a97913..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetRegistry.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 23, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal.workingsets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.wst.common.navigator.internal.plugin.WorkbenchNavigatorPlugin;
-import org.eclipse.wst.common.navigator.internal.views.extensions.RegistryReader;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ComponentWorkingSetRegistry {
- private static final ComponentWorkingSetRegistry INSTANCE = new ComponentWorkingSetRegistry();
- private static boolean isInitialized = false;
- private static final String[] NO_DESCRIPTORS = new String[0];
- private List commonWorkingSetDescriptors = new ArrayList();
-
- /**
- *
- */
- public ComponentWorkingSetRegistry() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public void init() {
- new ComponentWorkingSetRegistryReader().readRegistry();
- }
-
- /**
- *
- */
- public static ComponentWorkingSetRegistry getInstance() {
- if (isInitialized)
- return INSTANCE;
- synchronized (INSTANCE) {
- if (!isInitialized) {
- INSTANCE.init();
- isInitialized = true;
- }
- }
- return INSTANCE;
- }
-
- /**
- * @param aDesc
- */
- private void addCommonWorkingSetDescriptor(ComponentWorkingSetDescriptor aDesc) {
- if (aDesc == null)
- return;
- synchronized (commonWorkingSetDescriptors) {
- boolean bValue = commonWorkingSetDescriptors.contains(aDesc);
- if (bValue == false) {
- commonWorkingSetDescriptors.add(aDesc);
- }
- }
- }
-
- public ComponentWorkingSetDescriptor[] getComponentWorkingSetDescriptors() {
- ComponentWorkingSetDescriptor[] descriptors = new ComponentWorkingSetDescriptor[commonWorkingSetDescriptors.size()];
- return (ComponentWorkingSetDescriptor[])commonWorkingSetDescriptors.toArray(descriptors);
-
- }
-
- public boolean containsId(String id) {
- ComponentWorkingSetDescriptor descriptor = null;
- for (int x=0; x< commonWorkingSetDescriptors.size(); ++x) {
- descriptor = (ComponentWorkingSetDescriptor)commonWorkingSetDescriptors.get(x);
- if (descriptor.getId().equals(id))
- return true;
- }
- return false;
- }
-
- class ComponentWorkingSetRegistryReader extends RegistryReader {
-
- private static final String COMPONENT_WORKING_SET = "componentWorkingSet"; //$NON-NLS-1$
-
-
- ComponentWorkingSetRegistryReader() {
- super(J2EENavigatorPlugin.PLUGIN_ID, COMPONENT_WORKING_SET);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.extensions.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- protected boolean readElement(IConfigurationElement anElement) {
- if (COMPONENT_WORKING_SET.equals(anElement.getName())) {
- try {
- addCommonWorkingSetDescriptor(new ComponentWorkingSetDescriptor(anElement));
- return true;
- } catch (WorkbenchException e) {
- // log an error since its not safe to open a dialog here
- WorkbenchNavigatorPlugin.log("Unable to create common working set descriptor.", e.getStatus());//$NON-NLS-1$
- }
- }
- return false;
- }
- }
-
- /**
- * @param editPageId
- * @param typeId
- * @return
- */
- public ComponentWorkingSetDescriptor getWorkingSetDescriptor(String editPageId, String typeId) {
- ComponentWorkingSetDescriptor[] descriptors = getComponentWorkingSetDescriptors();
- ComponentWorkingSetDescriptor descriptor = null;
- for (int x=0; x< descriptors.length ; ++x) {
- descriptor = descriptors[x];
- if (descriptor.getId().equals(editPageId)
- && descriptor.getTypeId().equals(typeId))
- return descriptor;
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetUpdater.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetUpdater.java
deleted file mode 100644
index 92e8647..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetUpdater.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 24, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal.workingsets;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetUpdater;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ComponentWorkingSetUpdater implements IWorkingSetUpdater,
- IResourceChangeListener/*, IResourceDeltaVisitor*/ {
-
- public static final String ID= "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"; //$NON-NLS-1$
-
- private List fWorkingSets;
-
- private HashMap projectStructureEdits;
-
- private static class WorkingSetDelta {
- private IWorkingSet fWorkingSet;
- private List fElements;
- private boolean fChanged;
- public WorkingSetDelta(IWorkingSet workingSet) {
- fWorkingSet= workingSet;
- fElements= new ArrayList(Arrays.asList(workingSet.getElements()));
- }
-
- public IWorkingSet getWorkingSet() {
- return fWorkingSet;
- }
-
- public int indexOf(Object element) {
- return fElements.indexOf(element);
- }
-
- public void add( Object element) {
- synchronized (fWorkingSet) {
- if (indexOf(element) ==-1) {
- fElements.add(element);
- fChanged= true;
- }
- }
- }
- public void remove(int index) {
- if (fElements.remove(index) != null) {
- fChanged= true;
- }
- }
- public void process() {
- if (fChanged) {
- fWorkingSet.setElements((IAdaptable[])fElements.toArray(new IAdaptable[fElements.size()]));
- }
- }
- }
-
- /**
- *
- */
- public ComponentWorkingSetUpdater() {
- super();
- fWorkingSets= new ArrayList();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSetUpdater#add(org.eclipse.ui.IWorkingSet)
- */
- public void add(IWorkingSet workingSet) {
- //checkElementExistence(workingSet);
- synchronized (fWorkingSets) {
-
- updateElements(workingSet);
- fWorkingSets.add(workingSet);
- }
-
- }
-
-
- /**
- * @param project
- * @param typeId
- * @return
- */
- private boolean containsModuleType(IProject project, String typeId) {
- boolean bReturn = false;
- if (project.isAccessible()) {
- synchronized (this) {
- return J2EEProjectUtilities.isProjectOfType(project,typeId);
- }
- }
- return bReturn;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSetUpdater#remove(org.eclipse.ui.IWorkingSet)
- */
- public boolean remove(IWorkingSet workingSet) {
- boolean result;
- synchronized(fWorkingSets) {
- result= fWorkingSets.remove(workingSet);
- }
- return result;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSetUpdater#contains(org.eclipse.ui.IWorkingSet)
- */
- public boolean contains(IWorkingSet workingSet) {
- synchronized(fWorkingSets) {
- return fWorkingSets.contains(workingSet);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkingSetUpdater#dispose()
- */
- public void dispose() {
- synchronized(fWorkingSets) {
- fWorkingSets.clear();
- }
- disposeStructureEdits();
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- }
-
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
-
- IResourceDelta delta= event.getDelta();
- if (delta == null) return;
- IResourceDelta[] affectedChildren= delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.REMOVED | IResourceDelta.CHANGED, IResource.PROJECT);
- if (affectedChildren.length > 0) {
- for (int i= 0; i < affectedChildren.length; i++) {
- IResourceDelta projectDelta= affectedChildren[i];
- IProject project = (IProject)projectDelta.getResource();
-
- IWorkingSet[] workingSets;
- synchronized(fWorkingSets) {
- workingSets= (IWorkingSet[])fWorkingSets.toArray(new IWorkingSet[fWorkingSets.size()]);
- }
- for (int w= 0; w < workingSets.length; w++) {
- WorkingSetDelta workingSetDelta= new WorkingSetDelta(workingSets[w]);
- processResourceDelta(workingSetDelta,projectDelta, project);
- workingSetDelta.process();
- }
- }
- }
- }
-
-
-
-
- private void processResourceDelta(WorkingSetDelta result, IResourceDelta aDelta, IProject aProject) {
- //IResource resource= aDelta.getResource();
-
- int index= result.indexOf(aProject);
- int kind= aDelta.getKind();
- int flags= aDelta.getFlags();
-
-
- switch (aDelta.getKind()) {
- case IResourceDelta.REMOVED :
- if (index != -1) {
- result.remove(index) ;
- }
- disposeStructureEdits(aProject);
- break;
- case IResourceDelta.ADDED : {
- ComponentWorkingSet workingSet = (ComponentWorkingSet) result.getWorkingSet();
- if (containsModuleType(aProject,workingSet.getTypeId())) {
- if (index == -1)
- result.add(aProject);
- }
- break;
- }
-
-
- case IResourceDelta.CHANGED :
- // boolean natureMayHaveChanged = ((aDelta.getFlags() & IResourceDelta.DESCRIPTION) != 0) && ((aDelta.getFlags() & IResourceDelta.MARKERS) == 0);
- boolean projectOpenStateChanged = ((aDelta.getFlags() & IResourceDelta.OPEN) != 0);
- if (/*natureMayHaveChanged ||*/ projectOpenStateChanged) {
- if (aProject.isOpen()) {
- ComponentWorkingSet workingSet = (ComponentWorkingSet) result.getWorkingSet();
- if (containsModuleType(aProject,workingSet.getTypeId())) {
- result.add(aProject);
- }
- } else {
- if (index != -1) {
- result.remove(index) ;
- }
- disposeStructureEdits(aProject);
- }
-
- } else {
- ComponentWorkingSet workingSet = (ComponentWorkingSet) result.getWorkingSet();
- if (containsModuleType(aProject,workingSet.getTypeId())) {
- if (index == -1)
- result.add(aProject);
- } else {
- if (index != -1) {
- result.remove(index) ;
- }
- }
- break;
- }
- break;
- }
-
- }
-
-
- private void updateElements(IWorkingSet workingSet) {
- if (workingSet instanceof ComponentWorkingSet) {
- ComponentWorkingSet componentWorkingSet = (ComponentWorkingSet) workingSet;
- List result= new ArrayList();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i= 0; i < projects.length; i++) {
- try {
- if (containsModuleType(projects[i],componentWorkingSet.getTypeId())) {
- result.add(projects[i]);
- }
- } catch (Exception ex) {
- Logger.getLogger().logError(ex);
- }
- }
- componentWorkingSet.setElements((IAdaptable[])result.toArray(new IAdaptable[result.size()]));
- }
- }
-
-
- private void disposeStructureEdits() {
- Set keys = getProjectStructureEdits().keySet();
- for (Iterator iter = keys.iterator(); iter.hasNext();) {
- IProject proj = (IProject) iter.next();
- StructureEdit se =(StructureEdit)getProjectStructureEdits().get(proj);
- if (se != null)
- se.dispose();
-
- }
- }
-
- private void disposeStructureEdits(IProject aProject) {
- StructureEdit se =(StructureEdit)getProjectStructureEdits().get(aProject);
- if (se != null)
- se.dispose();
- getProjectStructureEdits().remove(aProject);
- }
-
- private HashMap getProjectStructureEdits() {
- if (projectStructureEdits != null)
- return projectStructureEdits;
-
- synchronized(this) {
- if (projectStructureEdits == null)
- projectStructureEdits = new HashMap();
- }
- return projectStructureEdits;
-
- }
-
- public StructureEdit getStructureEdit(IProject aProject) {
- if (getProjectStructureEdits().get(aProject) == null)
- getProjectStructureEdits().put(aProject,StructureEdit.getStructureEditForRead(aProject));
- return (StructureEdit)getProjectStructureEdits().get(aProject);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties
deleted file mode 100644
index da488ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties
+++ /dev/null
@@ -1,33 +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
-###############################################################################
-Plugin.name=J2EE Extensions to Common Navigator
-Plugin.providerName=Eclipse.org
-Plugin.description=Contains J2EE Extensions built on the Common Navigator Framework
-j2ee=J2EE
-j2ee.view_ui_=Project Explorer
-j2ee.category_ui_=J2EE
-Enterprise_Applications=Enterprise Applications
-Application_Client_Projects=Application Client Projects
-Connector_Projects=Connector Projects
-EJB_Projects=EJB Projects
-Web_Projects=Dynamic Web Projects
-Other_Projects=Other Projects
-J2EE_Add_Module=J2EE Add Module
-Adds_J2EE_modules_to_EAR_projects=Adds J2EE modules to EAR projects
-J2EE_Add_Utility_Jar=J2EE Add Utility Jar
-Adds_Utility_Jars_to_EAR_projects=Adds Utility Jars to EAR projects
-J2EE_Utility_Jar_Import=J2EE Utility Jar Import
-Import_a_jar_file_UI_=Import a jar file into an EAR project as a J2EE Utility Jar
-J2EE_Import=J2EE Import
-J2EE_IMPORT_MESSAGE=Imports J2EE artifacts: EARs, EJB Jars, Application Client Jars, RARs and WARs
-
-
-extension.j2ee.name=J2EE Deployment Descriptors
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
deleted file mode 100644
index f245898..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
+++ /dev/null
@@ -1,542 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="componentWorkingSet" name="Component Working Set" schema="schema/componentWorkingSet.exsd"/>
-
-<!-- Drop Adapter for Adding Modules to EARs -->
- <extension
- id="org.eclipse.jst.j2ee.internal.ui.navigator.addModule.dropHandler"
- point="org.eclipse.wst.common.navigator.views.dropHandler">
- <dropHandler
- class="org.eclipse.jst.j2ee.navigator.internal.dnd.AddModuleDropAction"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.addModule.dropHandler"
- name="%J2EE_Add_Module"
- description="%Adds_J2EE_modules_to_EAR_projects">
- <dragEnablement>
- <or>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.client.ApplicationClient">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.Connector">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EJBJar">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.WebApp">
- </objectClass>
- </or>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ejb.EJBNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.web.WebNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jdt.core.javanature">
- </objectState>
- </or>
- </and>
- </or>
- </dragEnablement>
- <dropEnablement
- validatorClass="org.eclipse.jst.j2ee.navigator.internal.dnd.AddModuleDropAction">
- <or>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </and>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMap">
- </objectClass>
- </or>
- </or>
- </dropEnablement>
- <serializers>
- <serializer
- class="org.eclipse.jst.j2ee.navigator.internal.dnd.ModuleIdentifierSerializer"
- id="org.eclipse.jst.j2ee.navigator.internal.dnd.ModuleIdentifierSerializer">
- </serializer>
- </serializers>
- </dropHandler>
- </extension>
- <!-- Drop Adapter for Adding Utility Jars to EARs -->
- <extension
- id="org.eclipse.jst.navigator.j2ee.dnd.addUtilityJar.dropHandler"
- point="org.eclipse.wst.common.navigator.views.dropHandler">
- <dropHandler
- class="org.eclipse.jst.j2ee.navigator.internal.dnd.AddUtilityJarDropAction"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.addUtilityJar.dropHandler"
- name="%J2EE_Add_Utility_Jar"
- description="%Adds_Utility_Jars_to_EAR_projects">
- <dragEnablement>
- <or>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.client.ApplicationClient">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.Connector">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EJBJar">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.WebApp">
- </objectClass>
- </or>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jdt.core.javanature">
- </objectState>
- </and>
- </or>
- </dragEnablement>
- <dropEnablement
- validatorClass="org.eclipse.jst.j2ee.navigator.internal.dnd.AddUtilityJarDropAction">
- <or>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </and>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMap">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider">
- </objectClass>
- </or>
- </or>
- </dropEnablement>
- <serializers>
- <serializer
- class="org.eclipse.jst.navigator.j2ee.dnd.ModuleIdentifierSerializer"
- id="org.eclipse.jst.navigator.j2ee.dnd.utilityJarIdentifierSerializer">
- </serializer>
- </serializers>
- </dropHandler>
- </extension>
- <extension
- id="org.eclipse.jst.navigator.j2ee.dnd.utilityJarImport.dropHandler"
- point="org.eclipse.wst.common.navigator.views.dropHandler">
- <dropHandler
- class="org.eclipse.jst.j2ee.navigator.internal.dnd.AddExternalUtilityJarDropAction"
- id="org.eclipse.jst.j2ee.navigator.internal.dnd.utilityJarImport.dropHandler"
- name="%J2EE_Utility_Jar_Import"
- description="%Import_a_jar_file_UI_">
- <dropEnablement>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider">
- </objectClass>
- </or>
- </dropEnablement>
- </dropHandler>
- </extension>
- <extension
- id="org.eclipse.jst.navigator.j2ee.dnd.j2eeImport.dropHandler"
- point="org.eclipse.wst.common.navigator.views.dropHandler">
- <dropHandler
- class="org.eclipse.jst.j2ee.navigator.internal.dnd.J2EEImportDropAction"
- id="org.eclipse.jst.j2ee.navigator.internal.dnd.j2eeImport.dropHandler"
- name="%J2EE_Import"
- description="%J2EE_IMPORT_MESSAGE">
- <dropEnablement>
- <or>
- <and>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- </or>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ejb.EJBNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.web.WebNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.client.ApplicationClient">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.Connector">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EJBJar">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.WebApp">
- </objectClass>
- </or>
- </dropEnablement>
- </dropHandler>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.navigator.views.navigatorContent">
- <navigatorContent
- name="%extension.j2ee.name"
- priority="higher"
- icon="icons/J2EEPerspective.gif"
- contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
- labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
- actionProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
- openListener="org.eclipse.jst.j2ee.internal.actions.J2EEResourceOpenListener"
- id="org.eclipse.jst.navigator.j2ee.ui.J2EEContent.experimental">
- <enables>
- <or>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="nature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </objectState>
-
- </or>
- </and>
- <objectClass
- adaptable="true"
- name="java.io.File">
- </objectClass>
- <objectClass name="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper" />
- </or>
- </enables>
-
- <emfEnablement>
- <package uri="org.eclipse.emf.ecore.resource" />
- <package uri="common.xmi" />
- <package uri="application.xmi" />
- <package uri="client.xmi" />
- <package uri="modulemap.xmi" />
- <package uri="ejb.xmi" />
- <package uri="jca.xmi" />
- <package uri="webapplication.xmi" />
- <package uri="jsp.xmi" />
- <package uri="commonext.xmi" />
- <package uri="localtran.xmi" />
- <package uri="ejbext.xmi" />
- <package uri="webappext.xmi" />
- <package uri="applicationext.xmi" />
- <package uri="applicationclientext.xmi" />
- <package uri="ejbbnd.xmi" />
- <package uri="webappbnd.xmi" />
- <package uri="commonbnd.xmi" />
- <package uri="j2cbnd.xmi" />
- <package uri="clientbnd.xmi" />
- <package uri="applicationbnd.xmi" />
- <package uri="ejbrdbmapping.xmi" />
- <package uri="http:///ejbrdbmapping.ecore" />
- </emfEnablement>
- </navigatorContent>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.navigator.views.actionProvider">
- <actionProvider
- class="org.eclipse.jst.common.navigator.internal.actions.OpenActionsExtension" >
- <enablement>
- <or>
- <objectClass
- adaptable="true"
- name="org.eclipse.emf.ecore.EObject" />
- <objectClass
- adaptable="true"
- name="org.eclipse.emf.edit.provider.ItemProvider" />
- </or>
- </enablement>
- </actionProvider>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.navigator.views.actionProvider">
- <actionProvider
- class="org.eclipse.wst.common.navigator.internal.actions.PortingActionExtension">
- <enablement>
- <or>
- <objectClass
- adaptable="true"
- name="org.eclipse.emf.ecore.EObject" />
- <objectClass
- adaptable="true"
- name="org.eclipse.emf.edit.provider.ItemProvider" />
- <objectClass
- adaptable="true"
- name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet" />
- </or>
- </enablement>
- </actionProvider>
- </extension>
- <!-- =========================================================================== -->
-<!-- Component Working Set -->
-<!-- =========================================================================== -->
- <extension
- point="org.eclipse.ui.workingSets">
- <workingSet
- name="Component"
- updaterClass="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetUpdater"
- icon="icons/J2EEPerspective.gif"
- id="org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage">
- </workingSet>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet">
- <componentWorkingSet
- id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"
- typeId = "jst.ejb"
- icon = "icons/ejbgroup_obj.gif"
- label = "%EJB_Projects">
- </componentWorkingSet>
- </extension>
- <extension
- point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet">
- <componentWorkingSet
- id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"
- typeId = "jst.web"
- icon = "icons/webgroup_obj.gif"
- label = "%Web_Projects">
- </componentWorkingSet>
- </extension>
- <extension
- point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet">
- <componentWorkingSet
- id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"
- typeId = "jst.ear"
- icon = "icons/eargroup_obj.gif"
- label = "%Enterprise_Applications">
- </componentWorkingSet>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet">
- <componentWorkingSet
- id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"
- typeId = "jst.appclient"
- icon = "icons/appclientgroup_obj.gif"
- label = "%Application_Client_Projects">
- </componentWorkingSet>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet">
- <componentWorkingSet
- id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"
- typeId = "jst.connector"
- icon = "icons/connectorgroup_obj.gif"
- label = "%Connector_Projects">
- </componentWorkingSet>
- </extension>
-
- <extension
- point="org.eclipse.jst.common.navigator.java.workingSetProviders">
- <workingSetProviders
- class="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetProvider">
- </workingSetProviders>
- </extension>
- <extension
- point="org.eclipse.ui.elementFactories">
- <factory
- class="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory"
- id="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory"/>
- </extension>
-
-<!-- =========================================================================== -->
-<!-- Adding the New to the Component Working Sets -->
-<!-- =========================================================================== -->
-
- <extension
- point="org.eclipse.wst.common.navigator.views.actionProvider">
- <actionProvider
- class="org.eclipse.jst.common.navigator.internal.actions.OpenActionsExtension" >
- <enablement>
- <or>
- <objectClass
- adaptable="true"
- name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet" />
- </or>
- </enablement>
- </actionProvider>
- </extension>
-
-
- <extension
- point="org.eclipse.wst.common.navigator.workbench.commonWizard">
- <!-- EAR New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
- <enablement>
- <or>
- <and>
- <objectClass
- name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet">
- </objectClass>
- <objectState
- name="componentTypeId"
- value="jst.ear">
- </objectState>
-
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- AppClient New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <enablement>
- <or>
- <and>
- <objectClass
- name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet">
- </objectClass>
- <objectState
- name="componentTypeId"
- value="jst.appclient">
- </objectState>
-
- </and>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <enablement>
- <or>
- <and>
- <objectClass
- name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet">
- </objectClass>
- <objectState
- name="componentTypeId"
- value="jst.web">
- </objectState>
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- Connector New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <enablement>
- <or>
- <and>
- <objectClass
- name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet">
- </objectClass>
- <objectState
- name="componentTypeId"
- value="jst.connector">
- </objectState>
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- EJB New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard">
- <enablement>
- <or>
- <and>
- <objectClass
- name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet">
- </objectClass>
- <objectState
- name="componentTypeId"
- value="jst.ejb">
- </objectState>
- </and>
- </or>
- </enablement>
- </commonWizard>
-
- </extension>
-
-
-
-</plugin>
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml
deleted file mode 100644
index f673207..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.j2ee.ui.navigator"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/schema/componentWorkingSet.exsd b/plugins/org.eclipse.jst.j2ee.navigator.ui/schema/componentWorkingSet.exsd
deleted file mode 100644
index 7ac37ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/schema/componentWorkingSet.exsd
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.navigator.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.navigator.ui" id="componentWorkingSet" name="Component Working Set"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="componentWorkingSet"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="componentWorkingSet">
- <complexType>
- <attribute name="typeId" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.classpath b/plugins/org.eclipse.jst.j2ee.ui/.classpath
deleted file mode 100644
index ae39a99..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="j2ee_ui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.ui/.cvsignore
deleted file mode 100644
index 5bc666b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-doc
-temp.folder
-build.xml
-j2ee_ui.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.project b/plugins/org.eclipse.jst.j2ee.ui/.project
deleted file mode 100644
index 937fa4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.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>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 5f0cd54..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,69 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WTP J2EE UI Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.common.jdt.internal.integration.ui,
- org.eclipse.jst.j2ee.internal,
- org.eclipse.jst.j2ee.internal.actions,
- org.eclipse.jst.j2ee.internal.client.actions,
- org.eclipse.jst.j2ee.internal.command,
- org.eclipse.jst.j2ee.internal.deployables,
- org.eclipse.jst.j2ee.internal.dialogs,
- org.eclipse.jst.j2ee.internal.ear.actions,
- org.eclipse.jst.j2ee.internal.ejb.provider,
- org.eclipse.jst.j2ee.internal.listeners,
- org.eclipse.jst.j2ee.internal.perspective,
- org.eclipse.jst.j2ee.internal.plugin,
- org.eclipse.jst.j2ee.internal.provider,
- org.eclipse.jst.j2ee.internal.ui.util,
- org.eclipse.jst.j2ee.internal.war.ui.util,
- org.eclipse.jst.j2ee.internal.wizard,
- org.eclipse.jst.j2ee.ui.project.facet,
- org.eclipse.jst.j2ee.ui.project.facet.appclient
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.jca,
- org.eclipse.jst.j2ee.web,
- org.eclipse.emf.edit.ui,
- org.eclipse.jdt.ui,
- org.eclipse.wst.validation,
- org.eclipse.jst.j2ee.core,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.ui.workbench,
- org.eclipse.jem.workbench,
- org.eclipse.jem,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jface.text,
- org.eclipse.wst.web,
- org.eclipse.wst.common.navigator.workbench,
- org.eclipse.debug.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jem.util,
- org.eclipse.jst.common.annotations.controller,
- org.eclipse.jst.j2ee.ejb.annotation.model,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.jst.server.core,
- org.eclipse.wst.web.ui
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.ui/about.html b/plugins/org.eclipse.jst.j2ee.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/build.properties b/plugins/org.eclipse.jst.j2ee.ui/build.properties
deleted file mode 100644
index 55ac828..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/build.properties
+++ /dev/null
@@ -1,22 +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
-###############################################################################
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- .,\
- META-INF/,\
- about.html
-jars.compile.order = .
-source.. = j2ee_ui/,\
- property_files/
-output.. = bin/
-src.includes = plugin.properties,\
- plugin.xml
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif
deleted file mode 100644
index 91e708f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif
deleted file mode 100644
index 3c455c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif
deleted file mode 100644
index a906320..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif
deleted file mode 100644
index 788e76d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif
deleted file mode 100644
index 3e31054..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif
deleted file mode 100644
index 573b60f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif
deleted file mode 100644
index 5df6193..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif
deleted file mode 100644
index 625e763..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif
deleted file mode 100644
index f52fa97..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 1823211..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index db8945f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif
deleted file mode 100644
index 6f83300..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif
deleted file mode 100644
index 2270b17..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif
deleted file mode 100644
index 099201b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif
deleted file mode 100644
index 5644b48..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif
deleted file mode 100644
index 8f943a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 928a0bf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index 9657388..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif
deleted file mode 100644
index 54b9b17..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif
deleted file mode 100644
index 35835bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif
deleted file mode 100644
index 673ba6a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif
deleted file mode 100644
index 9dae052..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif
deleted file mode 100644
index b248380..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif
deleted file mode 100644
index b0d08af..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
deleted file mode 100644
index f4cc6e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 6146667..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif
deleted file mode 100644
index ab3039c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif
deleted file mode 100644
index 83f9165..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif
deleted file mode 100644
index f277755..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
deleted file mode 100644
index dac498a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c47..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
deleted file mode 100644
index daff412..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif
deleted file mode 100644
index 48380fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
deleted file mode 100644
index d782734..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif
deleted file mode 100644
index 43e1655..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
deleted file mode 100644
index 19c9cae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif
deleted file mode 100644
index 93f0679..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 6146667..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
deleted file mode 100644
index f9941ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif
deleted file mode 100644
index e1fa98a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
deleted file mode 100644
index 2ec0ffb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
deleted file mode 100644
index 879329e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
deleted file mode 100644
index 6457e12..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
deleted file mode 100644
index 653ab02..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
deleted file mode 100644
index 2eb9efe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
deleted file mode 100644
index e12d2ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
deleted file mode 100644
index 5b53010..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
deleted file mode 100644
index 189c3e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
deleted file mode 100644
index 624fe7f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
deleted file mode 100644
index 46e3e08..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
deleted file mode 100644
index bb856a4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
deleted file mode 100644
index 2820c5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
deleted file mode 100644
index d238b56..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
deleted file mode 100644
index fc97d84..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
deleted file mode 100644
index 7dfe6e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
deleted file mode 100644
index aab4b50..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
deleted file mode 100644
index e0f50cc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 56d7fa7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
deleted file mode 100644
index e9ecba5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif
deleted file mode 100644
index 231f8d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 625e763..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif
deleted file mode 100644
index 231da61..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 3515396..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index a327fa6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index adca79e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 351a31d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif
deleted file mode 100644
index 81b1e3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 67754de..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index d123519..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif
deleted file mode 100644
index 3fb6df4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
deleted file mode 100644
index 51b1d5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
deleted file mode 100644
index 51b1d5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif
deleted file mode 100644
index 147e57a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif
deleted file mode 100644
index 9b72bf5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index d964e2e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif
deleted file mode 100644
index 767a416..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif
deleted file mode 100644
index ec315d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif
deleted file mode 100644
index 36a73ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif
deleted file mode 100644
index 3bc3831..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif
deleted file mode 100644
index d03e351..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif
deleted file mode 100644
index 14009e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif
deleted file mode 100644
index 9b93c9a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif
deleted file mode 100644
index 2038b22..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/JavaInsertionOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/JavaInsertionOperation.java
deleted file mode 100644
index 6ee2dd8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/JavaInsertionOperation.java
+++ /dev/null
@@ -1,251 +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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.jdt.internal.integration.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.ToolFactory;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.core.jdom.IDOMField;
-import org.eclipse.jdt.core.jdom.IDOMMethod;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jst.common.jdt.internal.integration.JavaInsertionHelper;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class JavaInsertionOperation implements IHeadlessRunnableWithProgress {
- private static final String NEW_LINE = System.getProperty("line.separator"); //$NON-NLS-1$
- protected JavaInsertionHelper insertionHelper;
- protected IEditorInput editorInput;
- protected IDocument document;
- protected ITextSelection textSelection;
- protected IProgressMonitor monitor;
-
- /**
- *
- */
- public JavaInsertionOperation(JavaInsertionHelper insertionHelper, IEditorInput editorInput, IDocument document, ITextSelection textSelection) {
- super();
- this.insertionHelper = insertionHelper;
- this.editorInput = editorInput;
- this.document = document;
- this.textSelection = textSelection;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.IHeadlessRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void run(IProgressMonitor monitorArg) throws InvocationTargetException, InterruptedException {
- this.monitor = monitorArg;
- insertCodeSnippet();
- processJavaHelper();
- }
-
- /**
- *
- */
- protected void insertCodeSnippet() throws InvocationTargetException {
- String replacementString = insertionHelper.getInsertionString();
- if (replacementString == null || replacementString.length() == 0)
- return;
- if (textSelection == null)
- throw new RuntimeException("No text selection for inserting text."); //$NON-NLS-1$
- try {
- document.replace(textSelection.getOffset(), textSelection.getLength(), replacementString);
- } catch (BadLocationException e) {
- throw new InvocationTargetException(e);
- }
- int start = textSelection.getStartLine();
- int lines = document.computeNumberOfLines(replacementString) + 1;
- format(document, start, lines, 0);
- }
-
- protected void processJavaHelper() {
- ICompilationUnit cu = JavaUI.getWorkingCopyManager().getWorkingCopy(editorInput);
- if (cu != null) {
- IType type = null;
- try {
- type = cu.getTypes()[0];
- } catch (JavaModelException e) {
- //Ignore
- }
- if (type != null) {
- if (insertionHelper.hasFields())
- createFields(type, insertionHelper.getFields());
- if (insertionHelper.hasMethods())
- createMethods(type, insertionHelper.getMethods());
- if (insertionHelper.hasImports())
- createImports(cu, insertionHelper.getImportStatements());
- executeExtendedOperations();
- }
- }
- }
-
- /**
- *
- */
- private void executeExtendedOperations() {
- List ops = insertionHelper.getExtendedOperations();
- if (ops != null) {
- for (int i = 0; i < ops.size(); i++)
- executedExtendedOperation((IHeadlessRunnableWithProgress) ops.get(i));
- }
- }
-
- /**
- * @param operation
- */
- private void executedExtendedOperation(IHeadlessRunnableWithProgress operation) {
- try {
- operation.run(null);
- } catch (Exception e) {
- Logger log = Logger.getLogger();
- log.log("Executing extended operation failed: " + operation); //$NON-NLS-1$
- log.log(e);
- }
- }
-
- protected void createFields(IType aType, List fields) {
- IDOMField field;
- for (int i = 0; i < fields.size(); i++) {
- field = (IDOMField) fields.get(i);
- if (!aType.getField(field.getName()).exists()) {
- try {
- aType.createField(format(field.getContents(), 1, true), null, true, null);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
-
- /**
- * @param wc
- */
- protected void createMethods(IType aType, List methods) {
- IDOMMethod method;
- for (int i = 0; i < methods.size(); i++) {
- method = (IDOMMethod) methods.get(i);
- if (!aType.getMethod(method.getName(), getParamaterTypeSignatures(method)).exists()) {
- try {
- aType.createMethod(format(method.getContents(), 1, true), null, true, null);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
-
- protected void createImports(ICompilationUnit cu, List imports) {
- String importStmt;
- for (int i = 0; i < imports.size(); i++) {
- importStmt = (String) imports.get(i);
- if (!cu.getImport(importStmt).exists() && !importStmt.startsWith("java.lang")) { //$NON-NLS-1$
- try {
- cu.createImport(importStmt, null, null);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
-
- protected String format(String contents, int indent, boolean ensureEndLineReturn) {
- Document doc = new Document(contents);
- int lines = doc.getNumberOfLines();
- format(doc, 0, lines - 1, indent);
- String result = doc.get();
- if (ensureEndLineReturn)
- result = ensureLineReturn(result);
- return result;
- }
-
- protected void format(IDocument documentArg, int startLine, int lines, int indent) {
- try {
- int end = documentArg.getLineOffset(startLine + lines);
- int length = end - startLine;
- CodeFormatter formatter = ToolFactory.createCodeFormatter(null);
- TextEdit edit = formatter.format(CodeFormatter.K_UNKNOWN, documentArg.get(), startLine, length, indent, null);
- if (edit != null) {
- try {
- edit.apply(documentArg);
- } catch (MalformedTreeException e) {
- //Ignore
- }
- }
- } catch (BadLocationException e) {
- Logger log = Logger.getLogger();
- log.log("Failed to format text."); //$NON-NLS-1$
- log.log(e);
- }
- }
-
- protected String formatString(String pattern, String[] arguments) {
- return MessageFormat.format(pattern, arguments);
- }
-
- /**
- * @param result
- * @return
- */
- protected String ensureLineReturn(String aString) {
- if (!aString.endsWith(NEW_LINE))
- return aString + NEW_LINE;
- return aString;
- }
-
- protected String[] getParamaterTypeSignatures(IDOMMethod aMethod) {
- String[] result = null;
- String[] parms = aMethod.getParameterTypes();
- if (parms != null) {
- if (parms.length == 0)
- result = parms;
- else
- result = new String[parms.length];
- boolean isResolved = false;
- String parm;
- for (int i = 0; i < parms.length; i++) {
- parm = parms[i];
- isResolved = parm.indexOf('.') > 0;
- result[i] = Signature.createTypeSignature(parm, isResolved);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java
deleted file mode 100644
index 5a79a1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java
+++ /dev/null
@@ -1,473 +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.jst.common.jdt.internal.integration.ui;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.ICompilationUnitDocumentProvider;
-import org.eclipse.jdt.internal.ui.javaeditor.InternalClassFileEditorInput;
-import org.eclipse.jdt.ui.IWorkingCopyManager;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jst.common.jdt.internal.integration.WTPWorkingCopyManager;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Insert the type's description here. Creation date: (4/25/2001 7:05:36 PM)
- *
- * @author: Administrator
- */
-public class WTPUIWorkingCopyManager extends WTPWorkingCopyManager {
- private IWorkingCopyManager javaWorkingCopyManager;
- private ICompilationUnitDocumentProvider cuDocumentProvider;
- private HashMap editorInputs;
- private CoreException lastError;
-
- /**
- * WTPUIWorkingCopyManager constructor comment.
- */
- public WTPUIWorkingCopyManager() {
- super();
- cuDocumentProvider = JavaPlugin.getDefault().getCompilationUnitDocumentProvider();
- javaWorkingCopyManager = JavaUI.getWorkingCopyManager();
- }
-
- protected void syncConnect(final IEditorInput input, final ICompilationUnit cu) throws CoreException {
- Display d = Display.getCurrent();
- if (d != null) {
- lastError = null;
- d.syncExec(new Runnable() {
- public void run() {
- try {
- connect(input, cu);
- } catch (CoreException e) {
- lastError = e;
- }
- }
- });
- } else
- connect(input, cu);
- if (lastError != null)
- throw lastError;
- }
-
- /**
- * Connect the CompilationUnitDocumentProvider to the
- *
- * @input and connect the annotation model from the provider to the IDocument of the
- * @input.
- */
- protected void connect(IEditorInput input, ICompilationUnit cu) throws CoreException {
- if (input != null) {
- javaWorkingCopyManager.connect(input);
- getEditorInputs().put(cu, input);
- IDocument doc = cuDocumentProvider.getDocument(input);
- cuDocumentProvider.getAnnotationModel(input).connect(doc);
- }
- }
-
- protected void revertWorkingCopies() {
- if (getEditorInputs().isEmpty())
- return;
- Iterator it = getEditorInputs().values().iterator();
- IEditorInput input;
- while (it.hasNext()) {
- input = (IEditorInput) it.next();
- revert(input);
- }
- }
-
- /**
- * Disonnect the CompilationUnitDocumentProvider from the
- *
- * @input and disconnect the annotation model from the provider from the IDocument of the
- * @input.
- */
- protected void disconnect(IEditorInput input) {
- IDocument doc = cuDocumentProvider.getDocument(input);
- cuDocumentProvider.getAnnotationModel(input).disconnect(doc);
- javaWorkingCopyManager.disconnect(input);
- }
-
- protected void revert(IEditorInput input) {
- try {
- cuDocumentProvider.resetDocument(input);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- IDocument doc = cuDocumentProvider.getDocument(input);
- IAnnotationModel model = cuDocumentProvider.getAnnotationModel(input);
-
- if (model instanceof AbstractMarkerAnnotationModel) {
- AbstractMarkerAnnotationModel markerModel = (AbstractMarkerAnnotationModel) model;
- markerModel.resetMarkers();
- }
- model.disconnect(doc);
- javaWorkingCopyManager.disconnect(input);
- }
-
- protected void disconnectEditorInputs() {
- Iterator it = getEditorInputs().values().iterator();
- IEditorInput input;
- while (it.hasNext()) {
- input = (IEditorInput) it.next();
- disconnect(input);
- }
- }
-
- protected void discardExistingCompilationUnits() {
- if (getEditorInputs().isEmpty())
- return;
- Iterator it = getEditorInputs().values().iterator();
- IEditorInput input;
- while (it.hasNext()) {
- input = (IEditorInput) it.next();
- disconnect(input);
- }
- }
-
- public Set getAffectedFiles() {
- Set aSet = new HashSet();
- Iterator it = getEditorInputs().keySet().iterator();
- ICompilationUnit unit = null;
- IResource resource = null;
- while (it.hasNext()) {
- unit = (ICompilationUnit) it.next();
- if (isDirty(unit)) {
- try {
- resource = unit.getUnderlyingResource();
- } catch (JavaModelException ignore) {
- continue;
- }
- if (resource instanceof IFile)
- aSet.add(resource);
- }
- }
- return aSet;
- }
-
- protected IEditorInput getEditorInput(ICompilationUnit cu) {
- IEditorInput input = primGetEditorInput(cu);
- if (input == null) {
- try {
- input = getEditorInput((IJavaElement) cu);
- } catch (JavaModelException e) {
- //Ignore
- }
- }
- return input;
- }
-
- protected IEditorInput getEditorInput(IJavaElement element) throws JavaModelException {
- while (element != null) {
- switch (element.getElementType()) {
- case IJavaElement.COMPILATION_UNIT : {
- ICompilationUnit cu = (ICompilationUnit) element;
- if (cu.isWorkingCopy())
- cu = cu.getPrimary();
- IResource resource = cu.getUnderlyingResource();
- if (resource.getType() == IResource.FILE)
- return new FileEditorInput((IFile) resource);
- break;
- }
- case IJavaElement.CLASS_FILE :
- return new InternalClassFileEditorInput((IClassFile) element);
- }
- element = element.getParent();
- }
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/25/2001 7:30:20 PM)
- *
- * @return java.util.HashMap
- */
- protected java.util.HashMap getEditorInputs() {
- if (editorInputs == null)
- editorInputs = new HashMap(20);
- return editorInputs;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input. Does not connect the edit model to the working copy.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException {
- if (cu == null || cu.isWorkingCopy()) {
- return cu;
- }
- ICompilationUnit newCU = super.getExistingWorkingCopy(cu);
- if (newCU != null)
- return newCU;
- IEditorInput editorInput = getEditorInput(cu);
- return javaWorkingCopyManager.getWorkingCopy(editorInput);
- }
-
- /**
- * Returns the working copy remembered for the compilation unit.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if there is no
- * remembered working copy for this compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
- if (forNewCU)
- return super.getWorkingCopy(cu, forNewCU);
- return primGetWorkingCopy(cu);
- }
-
- public boolean isDirty(ICompilationUnit cu) {
- if (cu == null)
- return false;
- IDocumentProvider p = cuDocumentProvider;
- return p == null ? false : p.canSaveDocument(getEditorInput(cu));
- }
-
- /**
- * mustSaveDocument method comment.
- */
- public boolean isSaveNeeded() {
- Iterator it = getEditorInputs().entrySet().iterator();
- while (it.hasNext()) {
- if (cuDocumentProvider.mustSaveDocument(it.next()))
- return true;
- }
- return false;
- }
-
- protected void primDispose() {
- super.primDispose();
- discardExistingCompilationUnits();
- editorInputs = null;
- javaWorkingCopyManager = null;
- }
-
- protected void primRevert() {
- super.primRevert();
- revertWorkingCopies();
- editorInputs = null;
- javaWorkingCopyManager = null;
- }
-
- protected IEditorInput primGetEditorInput(ICompilationUnit cu) {
- return (IEditorInput) getEditorInputs().get(cu);
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- protected org.eclipse.jdt.core.ICompilationUnit primGetWorkingCopy(ICompilationUnit cu) throws CoreException {
- if (cu == null) {
- return cu;
- }
- ICompilationUnit primary = cu.getPrimary();
- ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(primary);
- if (newCU != null)
- return newCU;
- IEditorInput editorInput = primGetEditorInput(primary);
- if (editorInput == null) {
- editorInput = getEditorInput(cu);
- syncConnect(editorInput, cu);
- }
- if (cu.isWorkingCopy())
- return cu;
- return javaWorkingCopyManager.getWorkingCopy(editorInput);
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- protected void primSaveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- super.primSaveCompilationUnits(null);
- saveExistingCompilationUnits(monitor);
- }
-
- protected void primSaveDocument(IEditorInput input, IDocument doc, IProgressMonitor monitor) throws CoreException {
- try {
- cuDocumentProvider.saveDocument(monitor, input, doc, true); // overwrite if needed
- } catch (CoreException ex) {
- if (!isFailedWriteFileFailure(ex))
- throw ex;
- IResource resource = (IResource) input.getAdapter(IRESOURCE_CLASS);
- if (resource == null || resource.getType() != IResource.FILE || !resource.getResourceAttributes().isReadOnly())
- throw ex;
-
- if (getSaveHandler().shouldContinueAndMakeFileEditable((IFile) resource))
- cuDocumentProvider.saveDocument(monitor, input, doc, false);
- else
- throw ex;
- }
- }
-
- protected void saveDocument(IEditorInput input, IProgressMonitor monitor) {
- IDocument doc = cuDocumentProvider.getDocument(input);
- boolean canSave = cuDocumentProvider.canSaveDocument(input);
- try {
- if (canSave) {
- ICompilationUnit unit = javaWorkingCopyManager.getWorkingCopy(input);
- synchronized (unit) {
- cuDocumentProvider.aboutToChange(input);
- primSaveDocument(input, doc, monitor);
- }
- }
- } catch (CoreException e) {
- WTPCommonPlugin.getDefault().getLogger().logError(e);
- throw new SaveFailedException(e);
- } finally {
- if (canSave)
- cuDocumentProvider.changed(input);
- }
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- protected void saveExistingCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- if (getEditorInputs().isEmpty())
- return;
- if (!validateState()) {
- if (monitor != null)
- monitor.setCanceled(true);
- return;
- }
- Iterator it = getEditorInputs().entrySet().iterator();
- Map.Entry entry;
- // ICompilationUnit cu;
- IEditorInput input;
- try {
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- // cu = (ICompilationUnit) entry.getKey();
- input = (IEditorInput) entry.getValue();
- try {
- saveDocument(input, null);
- } finally {
- disconnect(input);
- }
- }
- } finally {
- getEditorInputs().clear();
- }
- }
-
- /**
- * Call validateEdit for all read only IFiles corresponding to each WorkingCopy.
- *
- * @return boolean
- */
- private boolean validateState() {
- List readOnlyFiles = getReadOnlyModifiedFiles();
- if (readOnlyFiles != null && !readOnlyFiles.isEmpty()) {
- IFile[] files = new IFile[readOnlyFiles.size()];
- readOnlyFiles.toArray(files);
- IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- Object ctx = win == null ? null : win.getShell();
- IStatus status = ResourcesPlugin.getWorkspace().validateEdit(files, ctx);
- return status.isOK();
- }
- return true;
- }
-
- private List getReadOnlyModifiedFiles() {
- List readOnlyFiles = null;
- IFile readOnlyFile = null;
- Iterator it = getEditorInputs().entrySet().iterator();
- Map.Entry entry;
- // ICompilationUnit cu;
- IEditorInput input;
- IDocumentProvider docProv = cuDocumentProvider;
- while (it.hasNext()) {
- readOnlyFile = null;
- entry = (Map.Entry) it.next();
- // cu = (ICompilationUnit) entry.getKey();
- input = (IEditorInput) entry.getValue();
- if (docProv.canSaveDocument(input))
- readOnlyFile = getReadOnlyFile(input);
- if (readOnlyFile != null) {
- if (readOnlyFiles == null)
- readOnlyFiles = new ArrayList();
- readOnlyFiles.add(readOnlyFile);
- }
- }
- return readOnlyFiles;
- }
-
- private IFile getReadOnlyFile(IEditorInput input) {
- if (input instanceof IFileEditorInput) {
- IFileEditorInput finput = (IFileEditorInput) input;
- IFile file = finput.getFile();
- if (file.isReadOnly())
- return file;
- }
- return null;
- }
-
-
- protected void addDeletedCompilationUnit(ICompilationUnit cu) {
- IEditorInput input = primGetEditorInput(cu);
- if (input != null)
- disconnect(input);
- getEditorInputs().remove(cu);
- super.addDeletedCompilationUnit(cu);
- }
-
- /**
- * @see com.ibm.etools.j2ee.workbench.IJ2EEWorkingCopyManager#hasWorkingCopies()
- */
- public boolean hasWorkingCopies() {
- return super.hasWorkingCopies() || (editorInputs != null && !editorInputs.isEmpty());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java
deleted file mode 100644
index 48d311a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class AddModulestoEARPropertiesPage implements IJ2EEDependenciesControl, Listener {
-
- protected final IProject project;
- protected final J2EEDependenciesPage propPage;
- protected IVirtualComponent earComponent = null;
- protected Text componentNameText;
- protected Label availableModules;
- protected CheckboxTableViewer availableComponentsViewer;
- protected Button selectAllButton;
- protected Button deselectAllButton;
- protected Button projectJarButton;
- protected Button externalJarButton;
- protected Button addVariableButton;
- protected Composite buttonColumn;
-
- protected List j2eeComponentList = new ArrayList();
- protected List javaProjectsList = new ArrayList();
- protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS;
-
- /**
- * Constructor for AddModulestoEARPropertiesControl.
- */
- public AddModulestoEARPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
- this.project = project;
- this.propPage = page;
- earComponent = ComponentCore.createComponent(project);
- }
-
- public Composite createContents(final Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.EAR_Modules_Desc);
- createListGroup(composite);
- refresh();
- return composite;
- }
-
- protected void createListGroup(Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- listGroup.setLayout(layout);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.horizontalIndent = 5;
- listGroup.setLayoutData(gData);
-
- availableModules = new Label(listGroup, SWT.NONE);
- gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- availableModules.setText(J2EEUIMessages.getResourceString("AVAILABLE_J2EE_COMPONENTS")); //$NON-NLS-1$ = "Available dependent JARs:"
- availableModules.setLayoutData(gData);
- createTableComposite(listGroup);
- }
-
- public boolean performOk() {
- NullProgressMonitor monitor = new NullProgressMonitor();
- addModulesToEAR(monitor);
- removeModulesFromEAR(monitor);
- return true;
- }
-
- public void performDefaults() {
- }
-
- public boolean performCancel() {
- return true;
- }
-
- public void dispose() {
- }
-
- public void setVisible(boolean visible) {
- }
-
- private List newJ2EEModulesToAdd(){
- List newComps = new ArrayList();
- if (j2eeComponentList != null && !j2eeComponentList.isEmpty()){
- for (int i = 0; i < j2eeComponentList.size(); i++){
- IVirtualComponent handle = (IVirtualComponent)j2eeComponentList.get(i);
- if( !inEARAlready(handle))
- newComps.add(handle);
- }
- }
- return newComps;
- }
-
- private IStatus addModulesToEAR(IProgressMonitor monitor) {
- IStatus stat = OK_STATUS;
- try {
- if( earComponent != null ){
- List list = newJ2EEModulesToAdd();
- if (list != null && !list.isEmpty()) {
- IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, list);
- stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- if (stat != OK_STATUS)
- return stat;
- dm.getDefaultOperation().execute(monitor, null);
- }
-
- if (!javaProjectsList.isEmpty()) {
-
- for (int i = 0; i < javaProjectsList.size(); i++) {
- IProject proj = (IProject) javaProjectsList.get(i);
- IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, proj.getName());
- migrationdm.getDefaultOperation().execute(monitor, null);
-
-
- IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-
- IVirtualComponent targetcomponent = ComponentCore.createComponent(proj);
- targetCompList.add(targetcomponent);
-
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
- refdm.getDefaultOperation().execute(monitor, null);
- j2eeComponentList.add(targetcomponent);
- }
- }
- }
-
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- return OK_STATUS;
- }
-
- private IStatus removeModulesFromEAR(IProgressMonitor monitor) {
- IStatus stat = OK_STATUS;
- if( earComponent != null && j2eeComponentList != null){
- List list = getComponentsToRemove();
- if( !list.isEmpty()){
- try {
- IDataModelOperation op = removeComponentFromEAROperation(earComponent, list);
- op.execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
- }
- }
- return stat;
- }
-
- protected IDataModelOperation removeComponentFromEAROperation(IVirtualComponent sourceComponent, List targetComponentsHandles) {
- IDataModel model = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComponent);
- List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modHandlesList.addAll(targetComponentsHandles);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
- return model.getDefaultOperation();
- }
-
- protected List getComponentsToRemove(){
- //j2eeComponentList = getCheckedJ2EEElementsAsList();
- List list = new ArrayList();
- if( earComponent != null && list != null ){
- IVirtualReference[] oldrefs = earComponent.getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- IVirtualComponent handle = ref.getReferencedComponent();
- if( !j2eeComponentList.contains(handle)){
- list.add(handle);
- }
- }
- }
- return list;
- }
-
-
- public void handleEvent(Event event) {
- if (event.widget == selectAllButton)
- handleSelectAllButtonPressed();
- else if (event.widget == deselectAllButton)
- handleDeselectAllButtonPressed();
- else if(event.widget == projectJarButton)
- handleSelectProjectJarButton();
- else if(event.widget == externalJarButton)
- handleSelectExternalJarButton();
- else if(event.widget == addVariableButton)
- handleSelectVariableButton();
- }
-
- private void handleSelectAllButtonPressed() {
- availableComponentsViewer.setAllChecked(true);
- j2eeComponentList = getCheckedJ2EEElementsAsList();
- javaProjectsList = getCheckedJavaProjectsAsList();
- }
-
- private void handleDeselectAllButtonPressed() {
- availableComponentsViewer.setAllChecked(false);
- j2eeComponentList = new ArrayList();
- javaProjectsList = new ArrayList();
- }
-
- private void handleSelectExternalJarButton(){
- IPath[] selected= BuildPathDialogAccess.chooseExternalJAREntries(propPage.getShell());
-
- if (selected != null) {
- for (int i= 0; i < selected.length; i++) {
-
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
- selected[i].toString());
-
- ArrayList vlist = new ArrayList();
-
- //To do: check if archive component already exists
- IVirtualReference ref = ComponentCore.createReference( earComponent, archive );
- vlist.add(ref);
-
- IVirtualReference[] refs = (IVirtualReference[]) vlist.toArray(new IVirtualReference[vlist.size()]);
- earComponent.addReferences(refs);
- j2eeComponentList.add(archive);
- }
- refresh();
- }
-
- }
-
- private void handleSelectVariableButton(){
- IPath existingPath[] = new Path[0];
- IPath[] paths = BuildPathDialogAccess.chooseVariableEntries(propPage.getShell(), existingPath);
-
- if (paths != null) {
- refresh();
- for (int i = 0; i < paths.length; i++) {
- IPath resolvedPath= JavaCore.getResolvedVariablePath(paths[i]);
-
- java.io.File file = new java.io.File(resolvedPath.toOSString());
- if( file.isFile() && file.exists()){
- String type = VirtualArchiveComponent.VARARCHIVETYPE + IPath.SEPARATOR;
-
- IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
- paths[i].toString());
-
- ArrayList vlist = new ArrayList();
- IVirtualReference[] oldrefs = earComponent.getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- vlist.add(ref);
- }
-
- //To do: check if archive component already exists
- IVirtualReference ref = ComponentCore.createReference( earComponent, archive );
- vlist.add(ref);
-
- IVirtualReference[] refs = new IVirtualReference[vlist.size()];
- for (int j = 0; j < vlist.size(); j++) {
- IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
- refs[j] = tmpref;
- }
- earComponent.setReferences(refs);
- j2eeComponentList.add(archive);
- }else{
- //display error
- }
- }
- refresh();
- }
- }
-
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- fillComposite(composite);
- }
-
- public void fillComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createTable(parent);
- createButtonColumn(parent);
- }
-
- protected void createButtonColumn(Composite parent) {
- buttonColumn = createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createPushButtons();
- }
-
- protected void createPushButtons() {
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- projectJarButton = createPushButton(J2EEUIMessages.getResourceString("PROJECT_JAR"));//$NON-NLS-1$
- externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR"));//$NON-NLS-1$
- addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$NON-NLS-1$
- }
-
- protected Button createPushButton(String label) {
- Button aButton = primCreatePushButton(label, buttonColumn);
- aButton.addListener(SWT.Selection, this);
- aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- return aButton;
- }
-
- public Button primCreatePushButton(String label, Composite aButtonColumn) {
- Button aButton = new Button(aButtonColumn, SWT.PUSH);
- aButton.setText(label);
- return aButton;
- }
-
- public Composite createButtonColumnComposite(Composite parent) {
- Composite aButtonColumn = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- aButtonColumn.setLayout(layout);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- aButtonColumn.setLayoutData(data);
- return aButtonColumn;
- }
-
- public Group createGroup(Composite parent) {
- return new Group(parent, SWT.NULL);
- }
-
- protected void createTable(Composite parent) {
- availableComponentsViewer = createavailableComponentsViewer(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
- availableComponentsViewer.getTable().setLayoutData(gd);
-
- if (earComponent != null) {
- int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(earComponent);
- AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(earComponent, j2eeVersion);
- availableComponentsViewer.setContentProvider(provider);
- availableComponentsViewer.setLabelProvider(provider);
-
- addTableListeners();
- }
- }
-
- protected void addTableListeners() {
- addCheckStateListener();
- }
-
- protected void addCheckStateListener() {
- availableComponentsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- j2eeComponentList = getCheckedJ2EEElementsAsList();
- javaProjectsList = getCheckedJavaProjectsAsList();
-
- }
- });
- }
-
- protected Object[] getComponentsInEar() {
- List list = new ArrayList();
- IVirtualReference refs[] = earComponent.getReferences();
- for( int i=0; i< refs.length; i++){
- IVirtualReference ref = refs[i];
- list.add(ref.getReferencedComponent());
- }
- return list.toArray();
- }
-
- /**
- *
- * @param componentHandle
- * @return
- * @description returns true is a component is already in the EAR as a dependent
- */
- protected boolean inEARAlready(IVirtualComponent component){
- IVirtualReference refs[] = earComponent.getReferences();
- for( int i=0; i< refs.length; i++){
- IVirtualReference ref = refs[i];
- if ( ref.getReferencedComponent().equals( component ))
- return true;
- }
- return false;
- }
-
- protected List getCheckedJ2EEElementsAsList() {
- Object[] elements = availableComponentsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else {
- list = new ArrayList();
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof IVirtualComponent) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
- protected List getCheckedJavaProjectsAsList() {
- Object[] elements = availableComponentsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else {
- list = new ArrayList();
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof IProject) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
- public CheckboxTableViewer createavailableComponentsViewer(Composite parent) {
- int flags = SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
- Table table = new Table(parent, flags);
- availableComponentsViewer = new CheckboxTableViewer(table);
-
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- table.setLayout(tableLayout);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- availableComponentsViewer.setSorter(null);
-
- // table columns
- TableColumn fileNameColumn = new TableColumn(table, SWT.NONE, 0);
- fileNameColumn.setText(ManifestUIResourceHandler.JAR_Module_UI_);
- fileNameColumn.setResizable(true);
-
- TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1);
- projectColumn.setText(ManifestUIResourceHandler.Project_UI_);
- projectColumn.setResizable(true);
- tableLayout.layout(table, true);
- return availableComponentsViewer;
-
- }
-
- public void refresh() {
-
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- availableComponentsViewer.setInput(input);
- GridData data = new GridData(GridData.FILL_BOTH);
- int numlines = Math.min(10, availableComponentsViewer.getTable().getItemCount());
- data.heightHint = availableComponentsViewer.getTable().getItemHeight() * numlines;
- availableComponentsViewer.getTable().setLayoutData(data);
-
- TableItem [] items = availableComponentsViewer.getTable().getItems();
-
- List list = new ArrayList();
- Object[] comps = getComponentsInEar();
-
- for( int i=0; i< items.length; i++ ){
- Object element = items[i].getData();
- if( element instanceof IVirtualComponent){
- IVirtualComponent comp = (IVirtualComponent)element;
- for( int j=0; j< comps.length; j++ ){
- IVirtualComponent tempcomp = (IVirtualComponent)comps[j];
- if( comp.equals(tempcomp)){
- list.add(comp);
- }
- }
- }
- }
-
- availableComponentsViewer.setCheckedElements(list.toArray());
- j2eeComponentList.addAll(list);
- GridData btndata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonColumn.setLayoutData(btndata);
-
- }
-
- private void handleSelectProjectJarButton(){
- IPath[] selected= BuildPathDialogAccess.chooseJAREntries(propPage.getShell(), project.getLocation(), new IPath[0]);
-
- if (selected != null) {
- for (int i= 0; i < selected.length; i++) {
- //IPath fullPath = project.getFile(selected[i]).getFullPath();
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
- selected[i].makeRelative().toString());
-
- ArrayList vlist = new ArrayList();
-
- //To do: check if archive component already exists
- IVirtualReference ref = ComponentCore.createReference( earComponent, archive );
- vlist.add(ref);
-
- IVirtualReference[] refs = (IVirtualReference[]) vlist.toArray(new IVirtualReference[vlist.size()]);
- earComponent.addReferences(refs);
- j2eeComponentList.add(archive);
- }
- refresh();
- }
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
deleted file mode 100644
index 933e344..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 18, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class AvailableJ2EEComponentsForEARContentProvider implements IStructuredContentProvider, ITableLabelProvider {
- private int j2eeVersion;
- private IVirtualComponent earComponent;
-
- public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) {
- super();
- this.j2eeVersion = j2eeVersion;
- earComponent = aEarComponent;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- Object[] empty = new Object[0];
- if (!(inputElement instanceof IWorkspaceRoot))
- return empty;
- IProject[] projects = ((IWorkspaceRoot) inputElement).getProjects();
- if (projects == null || projects.length == 0)
- return empty;
- List validCompList = new ArrayList();
- for (int i = 0; i < projects.length; i++) {
- // get flexible project
- IProject project = projects[i];
- if(ModuleCoreNature.isFlexibleProject(project)){
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (J2EEProjectUtilities.isApplicationClientProject(project) ||
- J2EEProjectUtilities.isEJBProject(project) ||
- J2EEProjectUtilities.isDynamicWebProject(project) ||
- J2EEProjectUtilities.isJCAProject(project) ||
- J2EEProjectUtilities.isUtilityProject(project) ){
- int compJ2EEVersion = J2EEVersionUtil.convertVersionStringToInt(component);
- if( compJ2EEVersion <= j2eeVersion)
- //validCompList.add(component.getProject());
- validCompList.add(component);
- }else if(J2EEProjectUtilities.isEARProject(project)){
- //find the ArchiveComponent
- if( component.equals( earComponent )){
- IVirtualReference[] newrefs = component.getReferences();
- for( int k=0; k< newrefs.length; k++ ){
- IVirtualReference tmpref = newrefs[k];
- //IVirtualComponent enclosingcomp = tmpref.getEnclosingComponent();
- //boolean isBinary = enclosingcomp.isBinary();
- IVirtualComponent referencedcomp = tmpref.getReferencedComponent();
- boolean isBinary = referencedcomp.isBinary();
- if( isBinary ){
- validCompList.add(referencedcomp);
- //validCompList.add(referencedcomp.getProject());
- //IPath path = ComponentUtilities.getResolvedPathForArchiveComponent(name);
- }
- }
- }
- }
- } else
- try {
- if (project.exists() && project.isAccessible() && project.hasNature("org.eclipse.jdt.core.javanature")){ //$NON-NLS-1$
- validCompList.add(project);
- }
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- }
- }
- return validCompList.toArray();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- if (element instanceof IVirtualComponent) {
- IVirtualComponent comp = (IVirtualComponent)element;
- if( columnIndex == 0 )
- return comp.getName();
- if( columnIndex == 1 )
- return comp.getProject().getName();
- }else if(element instanceof IProject){
- return ((IProject)element).getName();
- }
- return null;
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java
deleted file mode 100644
index d510ab1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.Arrays;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.listeners.IValidateEditListener;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ClasspathTableManager implements Listener, ICommonManifestUIConstants {
-
- protected Button useClientJARsBtn;
- protected Button useServerJARsBtn;
- protected Button useAnyJARsBtn;
- protected Button upButton;
- protected Button downButton;
- protected Button selectAllButton;
- protected Button deselectAllButton;
- protected IClasspathTableOwner owner;
- protected Composite buttonColumn;
- protected ClasspathModel model;
- protected CheckboxTableViewer availableJARsViewer;
- protected IValidateEditListener validateEditListener;
- protected boolean isWLPEntry;
- protected Group radioGroup;
-
- protected boolean readOnly;
- protected AvailableJarsProvider availableJarsProvider;
- protected Button externalJarButton;
- protected Button projectJarButton;
- protected Button addVariableButton;
-
- /**
- * Constructor for ButtonBarManager.
- */
- public ClasspathTableManager(IClasspathTableOwner owner, ClasspathModel model) {
- super();
- this.owner = owner;
- this.model = model;
- }
-
- public ClasspathTableManager(IClasspathTableOwner owner, ClasspathModel model, IValidateEditListener listener) {
- super();
- this.owner = owner;
- this.model = model;
- this.validateEditListener = listener;
- }
- public void fillComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createRadioGroup(parent);
- createTable(parent);
- createButtonColumn(parent);
- }
-
- public void fillWLPComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createTable(parent);
- createWLPButtonColumn(parent);
- }
-
- private void initializeEJBClientDefaults() {
- if (model == null || model.getClassPathSelection() == null)
- return;
- boolean shouldUseServerJARs = false;
- ClassPathSelection selection = model.getClassPathSelection();
- int filterLevel;
- boolean ejbSelected = selection.isAnyEJBJarSelected();
- boolean clientSelected = selection.isAnyEJBClientJARSelected();
- if (ejbSelected && clientSelected)
- filterLevel = ClassPathSelection.FILTER_NONE;
- else if (shouldUseServerJARs) {
- if (clientSelected)
- filterLevel = ClassPathSelection.FILTER_NONE;
- else
- filterLevel = ClassPathSelection.FILTER_EJB_CLIENT_JARS;
- } else {
- if (ejbSelected)
- filterLevel = ClassPathSelection.FILTER_NONE;
- else
- filterLevel = ClassPathSelection.FILTER_EJB_SERVER_JARS;
- }
- initFilterLevel(filterLevel);
- }
-
- private void initFilterLevel(int filterLevel) {
- model.getClassPathSelection().setFilterLevel(filterLevel);
- switch (filterLevel) {
- case (ClassPathSelection.FILTER_NONE) :
- useAnyJARsBtn.setSelection(true);
- useClientJARsBtn.setSelection(false);
- useServerJARsBtn.setSelection(false);
- break;
- case (ClassPathSelection.FILTER_EJB_CLIENT_JARS) :
- useAnyJARsBtn.setSelection(false);
- useClientJARsBtn.setSelection(false);
- useServerJARsBtn.setSelection(true);
- break;
- case (ClassPathSelection.FILTER_EJB_SERVER_JARS) :
- useAnyJARsBtn.setSelection(false);
- useClientJARsBtn.setSelection(true);
- useServerJARsBtn.setSelection(false);
- break;
- }
- }
-
- private void createRadioGroup(Composite parent) {
- radioGroup = owner.createGroup(parent);
- radioGroup.setText(EJB_CLIENT_RADIO_UI_);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- data.horizontalIndent = 0;
- GridLayout layout = new GridLayout(3, false);
- radioGroup.setLayout(layout);
- radioGroup.setLayoutData(data);
-
- useServerJARsBtn = createRadioButton(USE_EJB_SERVER_JARs_UI_, radioGroup);
- useClientJARsBtn = createRadioButton(USE_EJB_CLIENT_JARs_UI_, radioGroup);
- useAnyJARsBtn = createRadioButton(USE_BOTH_UI_, radioGroup);
- initializeEJBClientDefaults();
- }
-
- protected void createButtonColumn(Composite parent) {
- buttonColumn = owner.createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createPushButtons();
- }
-
- protected void createWLPButtonColumn(Composite parent) {
- buttonColumn = owner.createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createWLPPushButtons();
- }
-
- protected void createTable(Composite parent) {
- availableJARsViewer = owner.createAvailableJARsViewer(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
- availableJARsViewer.getTable().setLayoutData(gd);
- availableJarsProvider = new AvailableJarsProvider();
- availableJARsViewer.setContentProvider(availableJarsProvider);
- availableJARsViewer.setLabelProvider(availableJarsProvider);
- addTableListeners();
- }
-
- protected void createWLPPushButtons() {
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- projectJarButton = createPushButton(J2EEUIMessages.getResourceString("PROJECT_JAR")); //$NON-NLS-1$
- externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR")); //$NON-NLS-1$
- addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$NON-NLS-1$
- if (isReadOnly()) {
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- projectJarButton.setEnabled(false);
- externalJarButton.setEnabled(false);
- addVariableButton.setEnabled(false);
- }
- }
-
-
- protected void createPushButtons() {
- upButton = createPushButton(UP_BUTTON);
- downButton = createPushButton(DOWN_BUTTON);
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- if (isReadOnly()) {
- upButton.setEnabled(false);
- downButton.setEnabled(false);
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- }
- }
-
- protected void createWebLibPushButtons() {
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- projectJarButton = createPushButton(J2EEUIMessages.getResourceString("PROJECT_JAR")); //$NON-NLS-1$
- externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR")); //$NON-NLS-1$
- addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$NON-NLS-1$
- if (isReadOnly()) {
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- }
- }
-
- protected Button createPushButton(String label) {
- Button aButton = owner.primCreatePushButton(label, buttonColumn);
- aButton.addListener(SWT.Selection, this);
- aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- return aButton;
- }
-
- protected Button createRadioButton(String label, Composite parent) {
- Button aButton = owner.primCreateRadioButton(label, parent);
- aButton.addListener(SWT.Selection, this);
- return aButton;
- }
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == upButton)
- upButtonSelected();
- else if (event.widget == downButton)
- downButtonSelected();
- else if (event.widget == selectAllButton)
- selectAllButtonSelected();
- else if (event.widget == deselectAllButton)
- deselectAllButtonSelected();
- else if (event.widget == useServerJARsBtn)
- handleServerJARsButtonSelected();
- else if (event.widget == useClientJARsBtn)
- handleClientJARsButtonSelected();
- else if (event.widget == useAnyJARsBtn)
- handleAnyJARsButtonSelected();
- else if(event.widget == projectJarButton)
- handleSelectProjectJarButton();
- else if(event.widget == externalJarButton)
- handleSelectExternalJarButton();
- else if(event.widget == addVariableButton)
- handleSelectVariableButton();
- }
-
- private void handleSelectExternalJarButton(){
- //owner.handleSelectExternalJarButton();
- if( owner instanceof WebLibDependencyPropertiesPage){
- WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
- control.handleSelectExternalJarButton();
- }
- }
- private void handleSelectProjectJarButton(){
- //owner.handleSelectExternalJarButton();
- if( owner instanceof WebLibDependencyPropertiesPage){
- WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
- control.handleSelectProjectJarButton();
- }
- }
-
- private void handleSelectVariableButton(){
- //owner.handleSelectVariableButton();
- if( owner instanceof WebLibDependencyPropertiesPage){
- WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
- control.handleSelectVariableButton();
- }
- }
-
- private void handleServerJARsButtonSelected() {
- model.selectFilterLevel(ClassPathSelection.FILTER_EJB_CLIENT_JARS);
- refresh();
- }
-
- private void handleClientJARsButtonSelected() {
- model.selectFilterLevel(ClassPathSelection.FILTER_EJB_SERVER_JARS);
- refresh();
- }
-
- private void handleAnyJARsButtonSelected() {
- model.selectFilterLevel(ClassPathSelection.FILTER_NONE);
- refresh();
- }
-
- public boolean validatateEdit() {
- return validateEditListener.validateState().isOK();
- }
-
- protected void deselectAllButtonSelected() {
- if (!validatateEdit())
- return;
- availableJARsViewer.setAllChecked(false);
- model.setAllClasspathElementsSelected(false);
- }
-
- protected void selectAllButtonSelected() {
- if (!validatateEdit())
- return;
- availableJARsViewer.setAllChecked(true);
- model.setAllClasspathElementsSelected(Arrays.asList(availableJARsViewer.getCheckedElements()), true);
- }
-
- protected java.util.List getSelectionAsList() {
- return ((IStructuredSelection) availableJARsViewer.getSelection()).toList();
- }
-
- protected void downButtonSelected() {
- if (!validatateEdit())
- return;
- model.moveDown(getSelectionAsList());
- refresh();
- }
-
- protected void upButtonSelected() {
- if (!validatateEdit())
- return;
- model.moveUp(getSelectionAsList());
- refresh();
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
- int[] indices = availableJARsViewer.getTable().getSelectionIndices();
- if (upButton != null && downButton != null) {
- upButton.setEnabled(canMoveUp(indices));
- downButton.setEnabled(canMoveDown(indices, availableJARsViewer.getTable().getItemCount()));
- }
- }
-
- protected boolean canMoveUp(int[] indices) {
- return canMove(indices, 0);
- }
-
- protected boolean canMoveDown(int[] indices, int itemCount) {
- return canMove(indices, itemCount - 1);
- }
-
- protected boolean canMove(int[] indices, int referenceIndex) {
- int length = indices.length;
- if (length == 0)
- return false;
- for (int i = 0; i < length; i++) {
- if (indices[i] == referenceIndex)
- return false;
- }
- return true;
- }
-
- protected void addTableListeners() {
- addCheckStateListener();
- addSelectionListener();
- }
-
- protected void addCheckStateListener() {
- availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- }
-
- protected void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- if (!J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject()) && (isReadOnly() || !validatateEdit() || (isMyClientJAR(event) && !event.getChecked()))) {
- availableJARsViewer.setChecked(event.getElement(), !event.getChecked());
- return;
- }
- ClasspathElement element = (ClasspathElement) event.getElement();
- model.setSelection(element, event.getChecked());
- }
-
- /**
- * @param event
- * @return
- */
- private boolean isMyClientJAR(CheckStateChangedEvent event) {
- ClasspathElement element = (ClasspathElement) event.getElement();
- if(getClasspathSelection() != null)
- return getClasspathSelection().isMyClientJAR(element);
- return false;
- }
-
- protected void addSelectionListener() {
- availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- tableSelectionChanged();
- }
- });
- }
-
- protected void tableSelectionChanged() {
- if (!isReadOnly())
- updateButtonEnablements();
- }
-
- protected ClassPathSelection getClasspathSelection() {
- if (model == null || model.getSelectedEARComponent() == null && !(J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject())))
- return null;
- return model.getClassPathSelection();
- }
-
- public void refreshCheckedItems() {
- if (getClasspathSelection() == null)
- return;
- java.util.List elements = getClasspathSelection().getClasspathElements();
- for (int i = 0; i < elements.size(); i++) {
- ClasspathElement element = (ClasspathElement) elements.get(i);
- availableJARsViewer.setChecked(element, element.isSelected());
- }
- }
-
- public void refresh() {
- if (!isWLPEntry() && !J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject())) {
- availableJARsViewer.setInput(getClasspathSelection());
- model.setWLPModel(false);
- GridData data = new GridData(GridData.FILL_BOTH);
- int numlines = Math.min(10, availableJARsViewer.getTable().getItemCount());
- data.heightHint = availableJARsViewer.getTable().getItemHeight() * numlines;
- availableJARsViewer.getTable().setLayoutData(data);
- refreshCheckedItems();
- updateButtonEnablements();
- } else {
- availableJARsViewer.setInput(model.getClassPathSelectionForWLPs());
- model.setWLPModel(true);
- GridData data = new GridData(GridData.FILL_BOTH);
- int numlines = Math.min(10, availableJARsViewer.getTable().getItemCount());
- data.heightHint = availableJARsViewer.getTable().getItemHeight() * numlines;
- availableJARsViewer.getTable().setLayoutData(data);
- refreshWLPCheckedItems();
- }
- }
-
- private void refreshWLPCheckedItems() {
- if (availableJARsViewer.getInput() != null) {
- java.util.List elements = ((ClassPathSelection) availableJARsViewer.getInput()).getClasspathElements();
- for (int i = 0; i < elements.size(); i++) {
- ClasspathElement element = (ClasspathElement) elements.get(i);
- availableJARsViewer.setChecked(element, element.isSelected());
- }
- }
- }
-
- /**
- * Gets the model.
- * @return Returns a ClasspathModel
- */
- public ClasspathModel getModel() {
- return model;
- }
-
- /**
- * Sets the model.
- * @param model The model to set
- */
- public void setModel(ClasspathModel model) {
- this.model = model;
- initializeEJBClientDefaults();
- }
-
- /**
- * Returns the readOnly.
- * @return boolean
- */
- public boolean isReadOnly() {
- return readOnly;
- }
-
-
- /**
- * Sets the readOnly.
- * @param readOnly The readOnly to set
- */
- public void setReadOnly(boolean readOnly) {
- this.readOnly = readOnly;
- }
-
- public boolean isWLPEntry() {
- return isWLPEntry;
- }
-
- public void setWLPEntry(boolean isWLPEntry) {
- this.isWLPEntry = isWLPEntry;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java
deleted file mode 100644
index 94f64b3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface IClasspathTableOwner {
- Button primCreatePushButton(String label, Composite buttonColumn);
- Button primCreateRadioButton(String label, Composite parent);
- CheckboxTableViewer createAvailableJARsViewer(Composite parent);
- Composite createButtonColumnComposite(Composite parent);
- //Button createHideEJBClientJARsButton(Composite parent); This method is never used hence commeting it out - vkb
- Group createGroup(Composite parent);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java
deleted file mode 100644
index a6c4542..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface ICommonManifestUIConstants {
- String UP_BUTTON = ManifestUIResourceHandler.Up_1;
- String DOWN_BUTTON = ManifestUIResourceHandler.Down_2;
- String SELECT_ALL_BUTTON = ManifestUIResourceHandler.Select_All_3;
- String DE_SELECT_ALL_BUTTON = ManifestUIResourceHandler.Deselect_All_4;
- String ERROR_READING_MANIFEST_DIALOG_TITLE = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_TITLE;
- String SAVE_MANIFEST_WITH_ERROR =ManifestUIResourceHandler.SAVE_MANIFEST_WITH_ERROR;
- String ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR;
- String ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE;
- String MANIFEST_PROBLEM_1 = ManifestUIResourceHandler.MANIFEST_PROBLEM_1;
- String MANIFEST_PROBLEM_2 = ManifestUIResourceHandler.MANIFEST_PROBLEM_2;
- String MANIFEST_PROBLEM_3 = ManifestUIResourceHandler.MANIFEST_PROBLEM_3;
- String MANIFEST_PROBLEM_4 = ManifestUIResourceHandler.MANIFEST_PROBLEM_4;
- String REDIRECT_TEXT_EDITOR_UI_ = ManifestUIResourceHandler.REDIRECT_TEXT_EDITOR_UI_;
-
- String EJB_CLIENT_RADIO_UI_ = CommonEditResourceHandler.getString("EJB_CLIENT_RADIO_UI_"); //$NON-NLS-1$
- String USE_EJB_SERVER_JARs_UI_ = CommonEditResourceHandler.getString("USE_EJB_SERVER_JARs_UI_"); //$NON-NLS-1$
- String USE_EJB_CLIENT_JARs_UI_ = CommonEditResourceHandler.getString("USE_EJB_CLIENT_JARs_UI_"); //$NON-NLS-1$
- String USE_BOTH_UI_ = CommonEditResourceHandler.getString("USE_BOTH_UI_"); //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java
deleted file mode 100644
index 6005131..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java
+++ /dev/null
@@ -1,58 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Interface for classes that implement a portion the "J2EE Module Dependencies"
- * property page logic.
- */
-public interface IJ2EEDependenciesControl extends ICommonManifestUIConstants {
-
- /**
- * Creates the Composite associated with this control.
- * @param parent Parent Composite.
- * @return Composite for the control.
- */
- Composite createContents(Composite parent);
-
- /**
- * Called when the property page's <code>performOk()</code> method is called.
- * @return
- */
- boolean performOk();
-
- /**
- * Called when the property page's <code>performDefaults()</code> method is called.
- * @return
- */
- void performDefaults();
-
- /**
- * Called when the property page's <code>performCancel()</code> method is called.
- * @return
- */
- boolean performCancel();
-
- /**
- * Called when the property page's <code>setVisible()</code> method is called.
- * @return
- */
- void setVisible(boolean visible);
-
- /**
- * Called when the property page's <code>dispose()</code> method is called.
- * @return
- */
- void dispose();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
deleted file mode 100644
index 4e810a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
+++ /dev/null
@@ -1,591 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-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.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.ComponentType;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.IComponentProjectMigrator;
-import org.eclipse.wst.common.componentcore.internal.Property;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class J2EEComponentProjectMigrator implements IComponentProjectMigrator {
-
- private static final String WEB_LIB_CONTAINER = "org.eclipse.jst.j2ee.internal.web.container";
- private static final String WEB_LIB_PATH = "/WEB-INF/lib";
- private static final String OLD_DEPLOYABLES_PATH = ".deployables";
- private IProject project;
- public J2EEComponentProjectMigrator() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public void migrateProject(IProject aProject) {
- if (aProject.isAccessible()) {
- project = aProject;
- removeComponentBuilders(project);
- if (multipleComponentsDetected())
- createNewProjects();
- String facetid = getFacetFromProject(project);
- if (facetid.length() == 0)
- addFacets(project);
- }
-
- }
-
- private void createNewProjects() {
-
- StructureEdit se = null;
- try {
- se = StructureEdit.getStructureEditForWrite(project);
- List comps = se.getComponentModelRoot().getComponents();
- List removedComps = new ArrayList();
- for (int i = 1;i<comps.size();i++) {
- WorkbenchComponent comp = (WorkbenchComponent) comps.get(i);
- IWorkspace ws = ResourcesPlugin.getWorkspace();
- IProject newProj = ws.getRoot().getProject(comp.getName());
- if (!newProj.exists()) {
- try {
- createProj(newProj,(!comp.getComponentType().getComponentTypeId().equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION)));
- WtpUtils.addNatures(newProj);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- addFacetsToProject(newProj,comp.getComponentType().getComponentTypeId(),comp.getComponentType().getVersion(),false);
- removedComps.add(comp);
- IFolder compFolder = project.getFolder(comp.getName());
- if (compFolder.exists())
- try {
- compFolder.delete(true,null);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- se.getComponentModelRoot().getComponents().removeAll(removedComps);
- se.save(null);
-
- } finally {
- if (se != null)
- se.dispose();
- }
-
-
- }
-
- private void createProj(IProject newProj, boolean isJavaProject) throws CoreException {
- newProj.create(null);
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(newProj.getName());
-// if (isJavaProject)
-// description.setNatureIds(new String[]{JavaCore.NATURE_ID});
- description.setLocation(null);
- newProj.open(null);
- newProj.setDescription(description, null);
- }
-
- private boolean multipleComponentsDetected() {
- StructureEdit se = null;
- try {
- se = StructureEdit.getStructureEditForRead(project);
- if (se == null) return false;
- if (se.getComponentModelRoot() == null) return false;
- return se.getComponentModelRoot().getComponents().size() > 1;
- } finally {
- if (se != null)
- se.dispose();
- }
- }
-
- private void removeComponentBuilders(IProject aProject) {
- try {
- aProject.refreshLocal(IResource.DEPTH_INFINITE,null);
- } catch (CoreException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- //IJavaProject javaP = JemProjectUtilities.getJavaProject(aProject);
- List oldBuilders = new ArrayList();
- oldBuilders.add("org.eclipse.wst.common.modulecore.ComponentStructuralBuilder");
- oldBuilders.add("org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver");
- oldBuilders.add("org.eclipse.wst.common.modulecore.DependencyGraphBuilder");
- try {
- J2EEProjectUtilities.removeBuilders(aProject,oldBuilders);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
- public String getFacetFromProject(IProject aProject) {
- return J2EEProjectUtilities.getJ2EEProjectType(aProject);
- }
-
-
- protected IDataModel setupJavaInstallAction(IProject aProject, boolean existing,String srcFolder) {
- IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- String jVersion = "1.4";
- IScopeContext context = new ProjectScope( project );
- IEclipsePreferences prefs
- = context.getNode( JavaCore.PLUGIN_ID );
- if (JavaCore.VERSION_1_5.equals(prefs.get(JavaCore.COMPILER_COMPLIANCE,JavaCore.VERSION_1_4))) {
- jVersion = "5.0";
- }
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, jVersion); //$NON-NLS-1$
- if (!existing)
- dm.setStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, srcFolder); //$NON-NLS-1$
- return dm;
- }
-
- protected IDataModel setupUtilInstallAction(IProject aProject,String specVersion) {
- IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- return aFacetInstallDataModel;
- }
- protected IDataModel setupEarInstallAction(IProject aProject,String specVersion) {
- IDataModel earFacetInstallDataModel = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
-
- return earFacetInstallDataModel;
- }
- protected IDataModel setupAppClientInstallAction(IProject aProject,String specVersion) {
- IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- aFacetInstallDataModel.setBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS,false);
- return aFacetInstallDataModel;
- }
- protected IDataModel setupConnectorInstallAction(IProject aProject,String specVersion) {
- IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new ConnectorFacetInstallDataModelProvider());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- return aFacetInstallDataModel;
- }
-
- private void addFacets(IProject aProject) {
- StructureEdit edit = null;
- try {
- edit = StructureEdit.getStructureEditForWrite(aProject);
- if (edit == null) return; // Not a component project....
- if (edit.getComponent() == null) return; // Can't migrate
- ComponentType type = edit.getComponent().getComponentType();
- if (type == null) return; // Can't migrate
- String compId = type.getComponentTypeId();
- String specVersion = edit.getComponent().getComponentType().getVersion();
- moveMetaProperties(edit.getComponent(),type);
- addFacetsToProject(aProject, compId, specVersion,true);
- }
- finally {
- if (edit != null) {
- edit.save(null);
- edit.dispose();
- }
- }
-
- }
-
- private void moveMetaProperties(WorkbenchComponent component, ComponentType type) {
- List props = type.getProperties();
- List compProps = component.getProperties();
- for (Iterator iter = props.iterator(); iter.hasNext();) {
- Property element = (Property) iter.next();
- Property newProp = ComponentcoreFactory.eINSTANCE.createProperty();
- newProp.setName(element.getName());
- newProp.setValue(element.getValue());
- compProps.add(newProp);
- }
- props.clear();
- }
-
- private void addFacetsToProject(IProject aProject, String compId, String specVersion,boolean existing) {
- if (compId.equals(J2EEProjectUtilities.DYNAMIC_WEB))
- installWEBFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.EJB))
- installEJBFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.APPLICATION_CLIENT))
- installAppClientFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION))
- installEARFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.JCA))
- installConnectorFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.UTILITY))
- installUtilityFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.STATIC_WEB))
- installStaticWebFacets(aProject,specVersion,existing);
- }
-
- private void installStaticWebFacets(IProject project2, String specVersion, boolean existing) {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, project2.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- //facetDMs.add(setupJavaInstallAction(webProj,existing,CreationConstants.DEFAULT_WEB_SOURCE_FOLDER));
- IDataModel newModel = setupStaticWebInstallAction(project2);
- facetDMs.add(newModel);
- //setRuntime(webProj,dm); //Setting runtime property
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- if (st != null)
- System.out.println(st);
- realException.printStackTrace();
- }
- }
- }
-
- private IDataModel setupStaticWebInstallAction(IProject project2) {
- IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new SimpleWebFacetInstallDataModelProvider());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project2.getName());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.0");
-
- return webFacetInstallDataModel;
- }
-
- private void installUtilityFacets(IProject aProject, String specVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(aProject,existing,"src"));
- IDataModel newModel = setupUtilInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- if (st != null)
- System.out.println(st);
- realException.printStackTrace();
- }
- }
-
- }
-
- private void installConnectorFacets(IProject aProject, String specVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(aProject,existing,CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER));
- IDataModel newModel = setupConnectorInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- if (st != null)
- System.out.println(st);
- realException.printStackTrace();
- }
- }
-
- }
-
- private void installEARFacets(IProject aProject, String specVersion, boolean existing) {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel newModel = setupEarInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- if (st != null)
- System.out.println(st);
- realException.printStackTrace();
- }
- }
-
- }
-
- private void installAppClientFacets(IProject aProject, String specVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(aProject,existing,CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER));
- IDataModel newModel = setupAppClientInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- if (st != null)
- System.out.println(st);
- realException.printStackTrace();
- }
- }
-
- }
-
- private void installEJBFacets(IProject ejbProject2,String ejbVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, ejbProject2.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(ejbProject2,existing,CreationConstants.DEFAULT_EJB_SOURCE_FOLDER));
- IDataModel newModel = setupEjbInstallAction(ejbProject2,ejbVersion,existing);
- facetDMs.add(newModel);
- //setRuntime(ejbProject2,dm); //Setting runtime property
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- if (st != null)
- System.out.println(st);
- realException.printStackTrace();
- }
- }
-
- }
- private void installWEBFacets(IProject webProj,String specVersion, boolean existing) {
- removeOldWebContainerIfNecessary(project);
- replaceDeployablesOutputIfNecessary(project);
-
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, webProj.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(webProj,existing,CreationConstants.DEFAULT_WEB_SOURCE_FOLDER));
- IDataModel newModel = setupWebInstallAction(webProj,specVersion);
- facetDMs.add(newModel);
- //setRuntime(webProj,dm); //Setting runtime property
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- if (st != null)
- System.out.println(st);
- realException.printStackTrace();
- }
- } catch (Exception ex) {
- if (ex != null && ex instanceof CoreException) {
- IStatus st = ((CoreException)ex).getStatus();
- if (st != null)
- System.out.println(st);
- ex.printStackTrace();
- }
- }
-
-
- }
- private void replaceDeployablesOutputIfNecessary(IProject proj) {
-
-
- IJavaProject jproj = JemProjectUtilities.getJavaProject(proj);
- final IClasspathEntry[] current;
- try {
- current = jproj.getRawClasspath();
- List updatedList = new ArrayList();
- IPath sourcePath = null;
- for (int i = 0; i < current.length; i++) {
- IClasspathEntry entry = current[i];
- if ((entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) && (entry.getOutputLocation() != null && entry.getOutputLocation().toString().indexOf(OLD_DEPLOYABLES_PATH) != -1)) {
- sourcePath = entry.getPath();
- updatedList.add(JavaCore.newSourceEntry(sourcePath));
- }
- else
- updatedList.add(entry);
- }
- IClasspathEntry[] updated = (IClasspathEntry[])updatedList.toArray(new IClasspathEntry[updatedList.size()]);
- jproj.setRawClasspath(updated, null);
- jproj.save(null, true);
- } catch (JavaModelException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
-
- }
-
- private void removeOldWebContainerIfNecessary(IProject webProj) {
-
- IJavaProject jproj = JemProjectUtilities.getJavaProject(webProj);
- final IClasspathEntry[] current;
- try {
- current = jproj.getRawClasspath();
- List updatedList = new ArrayList();
- for (int i = 0; i < current.length; i++) {
- IClasspathEntry entry = current[i];
- if ((entry.getPath().toString().indexOf(WEB_LIB_CONTAINER) == -1) && (entry.getPath().toString().indexOf(WEB_LIB_PATH) == -1))
- updatedList.add(entry);
- }
- IClasspathEntry[] updated = (IClasspathEntry[])updatedList.toArray(new IClasspathEntry[updatedList.size()]);
- jproj.setRawClasspath(updated, null);
- jproj.save(null, true);
- } catch (JavaModelException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
- protected IRuntime getRuntimeByID(String id) {
- IRuntime[] targets = ServerUtil.getRuntimes("", "");
- for (int i = 0; i < targets.length; i++) {
- IRuntime target = targets[i];
- if (id.equals(target.getId()))
- return target;
- }
- return null;
- }
- /**@deprecated
- * If this method is not used it should be removed at a later time, marking as deprecated
- * Warning cleanup 12/07/2005
- */
- private void setRuntime(IProject aProject,IDataModel facetModel) {
-
- IRuntime runtime = ServerCore.getProjectProperties(aProject).getRuntimeTarget();
- try {
- if (runtime != null) {
- IRuntime run = getRuntimeByID(runtime.getId());
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = null;
- try {
- if (run != null)
- facetRuntime = FacetUtil.getRuntime(run);
- }
- catch (IllegalArgumentException ex)
- {}
- if (facetRuntime != null) {
- facetModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME,facetRuntime);
- }
- }
- } catch (IllegalArgumentException e) {
- Logger.getLogger().logError(e);
- }
-
-
- }
-
- protected IDataModel setupEjbInstallAction(IProject aProject,String ejbVersion, boolean existing) {
- IDataModel ejbFacetInstallDataModel = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
- ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, ejbVersion);
- ejbFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- ejbFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- if (!existing)
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CONFIG_FOLDER, CreationConstants.DEFAULT_EJB_SOURCE_FOLDER);
- return ejbFacetInstallDataModel;
- }
-
- protected IDataModel setupWebInstallAction(IProject aProject,String specVersion) {
- IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- webFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- webFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- return webFacetInstallDataModel;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java
deleted file mode 100644
index 7eb2f77..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc, IBM Corporation
- * 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 implementation as prop page heirarchy
- * rfrost@bea.com - conversion to single property page impl
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Primary project property page for J2EE dependencies; content is dynamically
- * generated based on the project facets and will be comprised by a
- * set of IJ2EEDependenciesControl implementations.
- */
-public class J2EEDependenciesPage extends PropertyPage {
-
- public String DESCRIPTION = J2EEUIMessages.getResourceString("DESCRIPTION"); //$NON-NLS-1$
-
- private IProject project;
- private IJ2EEDependenciesControl[] controls = new IJ2EEDependenciesControl[0];
-
- public J2EEDependenciesPage() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent) {
-
- // Need to find out what type of project we are handling
- project = (IProject) getElement().getAdapter(IResource.class);
- boolean isEAR = false;
- boolean isWEB = false;
- try {
- final IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject == null) {
- return getFacetErrorComposite(parent);
- }
- isEAR = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE));
- isWEB = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
- } catch (CoreException ce) {
- return getFacetErrorComposite(parent);
- }
-
- if (isEAR) {
- return createEARContent(parent);
- } else if (isWEB) {
- return createWebContent(parent);
- } else {
- return createNonEARContent(parent);
- }
- }
-
- private Composite getFacetErrorComposite(final Composite parent) {
- final String errorCheckingFacet = ManifestUIResourceHandler.Error_Checking_Project_Facets;
- setErrorMessage(errorCheckingFacet);
- setValid(false);
- return getErrorComposite(parent, errorCheckingFacet);
- }
-
- private Composite getErrorComposite(final Composite parent, final String error) {
- final Composite composite = new Composite(parent, SWT.NONE);
- final GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- final Label label= new Label(composite, SWT.NONE);
- label.setText(error);
- return composite;
- }
-
- private Composite createEARContent(final Composite parent) {
- controls = new IJ2EEDependenciesControl[1];
- controls[0] = new AddModulestoEARPropertiesPage(project, this);
- return controls[0].createContents(parent);
- }
-
- private Composite createWebContent(final Composite parent) {
- final boolean standalone = J2EEProjectUtilities.isStandaloneProject(project);
-
- if (standalone) {
- // only need to create the Web Libraries page
- controls = new IJ2EEDependenciesControl[1];
- controls[0] = new WebLibDependencyPropertiesPage(project, this);
- return controls[0].createContents(parent);
- } else {
- // Create a tabbed folder with both "J2EE Modules" and "Web Libraries"
- final TabFolder folder = new TabFolder(parent, SWT.LEFT);
- folder.setLayoutData(new GridData(GridData.FILL_BOTH));
- folder.setFont(parent.getFont());
-
- // Create the two tabs
- controls = new IJ2EEDependenciesControl[2];
-
- controls[0] = new JARDependencyPropertiesPage(project, this);
- TabItem tab = new TabItem(folder, SWT.NONE);
- tab.setControl(controls[0].createContents(folder));
- tab.setText(ManifestUIResourceHandler.J2EE_Modules);
- controls[1] = new WebLibDependencyPropertiesPage(project, this);
- tab = new TabItem(folder, SWT.NONE);
- tab.setControl(controls[1].createContents(folder));
- tab.setText(ManifestUIResourceHandler.Web_Libraries);
-
- folder.setSelection(0);
- return folder;
- }
- }
-
- private Composite createNonEARContent(final Composite parent) {
- controls = new IJ2EEDependenciesControl[1];
- controls[0] = new JARDependencyPropertiesPage(project, this);
- return controls[0].createContents(parent);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
- public boolean performOk() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null && !controls[i].performOk()) {
- return false;
- }
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
- */
- public void performDefaults() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].performDefaults();
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performCancel()
- */
- public boolean performCancel() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null && !controls[i].performCancel()) {
- return false;
- }
- }
- return super.performCancel();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].setVisible(visible);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
- */
- public void dispose() {
- super.dispose();
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].dispose();
- }
- }
- }
-
- protected static void createDescriptionComposite(final Composite parent, final String description) {
- Composite descriptionComp = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- descriptionComp.setLayout(layout);
- descriptionComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- fillDescription(descriptionComp, description);
- }
-
- private static void fillDescription(Composite c, String s) {
- GridData data = new GridData();
- data.horizontalSpan = 1;
- data.horizontalIndent = 5;
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 250;
- Text text = new Text(c, SWT.MULTI | SWT.WRAP);
- text.setLayoutData(data);
- text.setTextLimit(80);
- text.setEditable(false);
- text.setText(s);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java
deleted file mode 100644
index ddfb3ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java
+++ /dev/null
@@ -1,58 +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
- *******************************************************************************/
-/*
- * Created on Apr 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface J2EEPropertiesConstants {
- //J2EEUIMessages.getResourceString("Import_Classes");
- public String J2EE_LEVEL = J2EEUIMessages.getResourceString("J2EE_Level"); //$NON-NLS-1$
- public String J2EE_12 = J2EEUIMessages.getResourceString("J2EE_12"); //$NON-NLS-1$
- public String J2EE_12_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_12_DESCRIPTION"); //$NON-NLS-1$
- public String J2EE_13 = J2EEUIMessages.getResourceString("J2EE_13"); //$NON-NLS-1$
- public String J2EE_13_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_13_DESCRIPTION"); //$NON-NLS-1$
- public String J2EE_14_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_14_DESCRIPTION"); //$NON-NLS-1$
- public String EJB_LEVEL = J2EEUIMessages.getResourceString("EJB_LEVEL"); //$NON-NLS-1$
- public String EJB_11 = J2EEUIMessages.getResourceString("EJB_11"); //$NON-NLS-1$
- public String EJB_11_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_11_DESCRIPTION"); //$NON-NLS-1$
- public String EJB_20 = J2EEUIMessages.getResourceString("EJB_20"); //$NON-NLS-1$
- public String EJB_20_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_20_DESCRIPTION"); //$NON-NLS-1$
- public String EJB_21_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_21_DESCRIPTION"); //$NON-NLS-1$
- public String CONNECTOR_LEVEL = J2EEUIMessages.getResourceString("CONNECTOR_LEVEL"); //$NON-NLS-1$
- public String CONNECTOR_10 = J2EEUIMessages.getResourceString("CONNECTOR_10"); //$NON-NLS-1$
- public String CONNECTOR_15 = J2EEUIMessages.getResourceString("CONNECTOR_15"); //$NON-NLS-1$
- public String CONNECTOR_10_DESCRIPTION = J2EEUIMessages.getResourceString("CONNECTOR_10_DESCRIPTION"); //$NON-NLS-1$
- public String CONNECTOR_15_DESCRIPTION = J2EEUIMessages.getResourceString("CONNECTOR_15_DESCRIPTION"); //$NON-NLS-1$
- public String WEB_LEVEL = J2EEUIMessages.getResourceString("WEB_LEVEL"); //$NON-NLS-1$
- public String WEB_22_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_22_DESCRIPTION"); //$NON-NLS-1$
- public String WEB_23_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_23_DESCRIPTION"); //$NON-NLS-1$
- public String WEB_24_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_24_DESCRIPTION"); //$NON-NLS-1$
- public String APP_CLIENT_LEVEL = J2EEUIMessages.getResourceString("APP_CLIENT_LEVEL"); //$NON-NLS-1$
- public String APP_CLIENT_12_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_12_DESCRIPTION"); //$NON-NLS-1$
- public String APP_CLIENT_13_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_13_DESCRIPTION"); //$NON-NLS-1$
- public String APP_CLIENT_14_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_14_DESCRIPTION"); //$NON-NLS-1$
- public String DESCRIPTION = J2EEUIMessages.getResourceString("DESCRIPTION"); //$NON-NLS-1$
- public String WEB_CONTEXT_ROOT = J2EEUIMessages.getResourceString("WEB_CONTEXT_ROOT"); //$NON-NLS-1$
- public String WEB_CONTENT_FOLDER_NAME = J2EEUIMessages.getResourceString("WEB_CONTENT_FOLDER_NAME"); //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java
deleted file mode 100644
index 39ab51e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java
+++ /dev/null
@@ -1,764 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-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.emf.common.util.URI;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelEvent;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelListener;
-import org.eclipse.jst.j2ee.internal.common.operations.UpdateJavaBuildPathOperation;
-import org.eclipse.jst.j2ee.internal.listeners.IValidateEditListener;
-import org.eclipse.jst.j2ee.internal.listeners.ValidateEditListener;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-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.IVirtualReference;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class JARDependencyPropertiesPage implements IJ2EEDependenciesControl, IClasspathTableOwner, Listener, ClasspathModelListener {
-
- protected final IProject project;
- protected final J2EEDependenciesPage propPage;
- protected IOException caughtManifestException;
- protected boolean isDirty;
- protected Text classPathText;
- protected Text componentNameText;
- protected ClasspathModel model;
- protected CCombo availableAppsCombo;
- protected ClasspathTableManager tableManager;
- protected IValidateEditListener validateEditListener;
- protected Label manifestLabel;
- protected Label enterpriseApplicationLabel;
- protected Label availableDependentJars;
-
- /**
- * Constructor for JARDependencyPropertiesControl
- */
- public JARDependencyPropertiesPage(final IProject project,
- final J2EEDependenciesPage page) {
- super();
- this.project = project;
- this.propPage = page;
- }
-
- /**
- * Returns false if page should not be displayed
- * for the project.
- */
- protected void initialize() {
- model = new ClasspathModel(null);
- model.setProject(project);
- if( model.getComponent() != null ){
- model.addListener(this);
- updateModelManifest();
- initializeValidateEditListener();
- }
- }
-
- public void dispose() {
- if(model.earArtifactEdit != null) {
- model.earArtifactEdit.dispose();
- model.earArtifactEdit = null;
- }
- }
-
- private void updateModelManifest() {
- if (JemProjectUtilities.isBinaryProject(project) || model.getAvailableEARComponents().length == 0)
- return;
- IContainer root = null;
- IFile manifestFile = null;
- if (project != null)
- root = project;
- else
- root = JemProjectUtilities.getSourceFolderOrFirst(project, null);
-
- if (root != null)
- manifestFile = root.getFile(new Path(J2EEConstants.MANIFEST_URI));
-
- if (manifestFile == null || !manifestFile.exists())
- return;
-
- InputStream in = null;
- try {
- in = manifestFile.getContents();
- ArchiveManifest mf = new ArchiveManifestImpl(new Manifest(in));
- model.primSetManifest(mf);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- model.primSetManifest(new ArchiveManifestImpl());
- } catch (IOException iox) {
- Logger.getLogger().logError(iox);
- model.primSetManifest(new ArchiveManifestImpl());
- caughtManifestException = iox;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- //Ignore
- }
- }
- }
- }
-
- protected void initializeValidateEditListener() {
- validateEditListener = new ValidateEditListener(null, model);
- validateEditListener.setShell(propPage.getShell());
- }
-
- public void setVisible(boolean visible) {
- if (visible && caughtManifestException != null && !model.isDirty())
- ManifestErrorPrompter.showManifestException(propPage.getShell(), ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE, false, caughtManifestException);
-
- }
-
- public Composite createContents(Composite parent) {
- initialize();
- Composite composite = createBasicComposite(parent);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- if( model.getComponent() != null ){
- if(!isValidComponent())
- return composite;
- J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.J2EE_Modules_Desc);
- createProjectLabelsGroup(composite);
- createListGroup(composite);
- createTextGroup(composite);
- refresh();
- }
- return composite;
- }
-
- /**
- * @param comp
- * @return
- */
- protected Composite createBasicComposite(Composite comp) {
- Composite composite = new Composite(comp, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- return composite;
- }
-
- protected boolean isValidComponent() {
- if (J2EEProjectUtilities.isEARProject(project)) {
- propPage.setErrorMessage(ManifestUIResourceHandler.EAR_Module_Dep_Error);
- return false;
- } else if (J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject()) ) {
- propPage.setErrorMessage(ClasspathModel.NO_EAR_MESSAGE);
- return false;
- }
- return true;
- }
-
- protected void createProjectLabelsGroup(Composite parent) {
-
- Composite labelsGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- labelsGroup.setLayout(layout);
- labelsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- /*
- Label label = new Label(labelsGroup, SWT.NONE);
- label.setText(ManifestUIResourceHandler.Project_name__UI_);
-
- componentNameText = new Text(labelsGroup, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- componentNameText.setEditable(false);
- componentNameText.setLayoutData(data);
- componentNameText.setText(project.getName());
- */
-
- createEnterpriseAppsControls(labelsGroup);
-
- }
-
- private void createEnterpriseAppsControls(Composite labelsGroup) {
-
- enterpriseApplicationLabel = new Label(labelsGroup, SWT.NONE);
- enterpriseApplicationLabel.setText(ManifestUIResourceHandler.EAR_Project_Name__UI__UI_);
-
- availableAppsCombo = new CCombo(labelsGroup, SWT.READ_ONLY | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- availableAppsCombo.setLayoutData(gd);
-
- availableAppsCombo.addListener(SWT.Selection, this);
-
- }
-
- protected void createListGroup(Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- listGroup.setLayout(layout);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.horizontalIndent = 5;
- listGroup.setLayoutData(gData);
-
- availableDependentJars = new Label(listGroup, SWT.NONE);
- gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- availableDependentJars.setText(ManifestUIResourceHandler.Available_dependent_JARs__UI_);
- availableDependentJars.setLayoutData(gData);
- createTableComposite(listGroup);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.common.ui.classpath.IClasspathTableOwner#createGroup(org.eclipse.swt.widgets.Composite)
- */
- public Group createGroup(Composite parent) {
- return new Group(parent, SWT.NULL);
- }
-
- protected void createTextGroup(Composite parent) {
-
- Composite textGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- textGroup.setLayout(layout);
- textGroup.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL));
-
- createClassPathText(textGroup);
-
- }
-
- protected void createClassPathText(Composite textGroup) {
-
- manifestLabel = new Label(textGroup, SWT.NONE);
- manifestLabel.setText(ManifestUIResourceHandler.Manifest_Class_Path__UI_);
-
- classPathText = new Text(textGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.widthHint = 400;
- gData.heightHint = 100;
- classPathText.setLayoutData(gData);
- classPathText.setEditable(false);
- }
-
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- tableManager = new ClasspathTableManager(this, model, validateEditListener);
- tableManager.setReadOnly(isReadOnly());
- tableManager.fillComposite(composite);
- }
-
- /**
- * @see IClasspathTableOwner#createAvailableJARsViewer(Composite)
- */
- public CheckboxTableViewer createAvailableJARsViewer(Composite parent) {
- int flags = SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
- Table table = new Table(parent,flags);
- CheckboxTableViewer availableJARsViewer = new CheckboxTableViewer(table);
-
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- table.setLayout(tableLayout);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- availableJARsViewer.setSorter(null);
-
- // table columns
- TableColumn fileNameColumn = new TableColumn(table, SWT.NONE, 0);
- fileNameColumn.setText(ManifestUIResourceHandler.JAR_Module_UI_);
- fileNameColumn.setResizable(true);
-
- TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1);
- projectColumn.setText(ManifestUIResourceHandler.Project_UI_);
- projectColumn.setResizable(true);
- tableLayout.layout(table, true);
- return availableJARsViewer;
-
- }
-
- /**
- * @see IClasspathTableOwner#createButtonColumnComposite(Composite)
- */
- public Composite createButtonColumnComposite(Composite parent) {
- Composite buttonColumn = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- buttonColumn.setLayout(layout);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonColumn.setLayoutData(data);
- return buttonColumn;
- }
-
- /**
- * @see IClasspathTableOwner
- */
- public Button primCreatePushButton(String label, Composite buttonColumn) {
- Button aButton = new Button(buttonColumn, SWT.PUSH);
- aButton.setText(label);
- return aButton;
- }
-
- /**
- * @see IClasspathTableOwner
- */
- public Button primCreateRadioButton(String label, Composite parent) {
- Button aButton = new Button(parent, SWT.RADIO);
- aButton.setText(label);
- return aButton;
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == availableAppsCombo)
- availableAppsSelected(event);
- }
-
- protected void availableAppsSelected(Event event) {
- int index = availableAppsCombo.getSelectionIndex();
- model.selectEAR(index);
- }
- protected void populateApps() {
- IVirtualComponent[] components = model.getAvailableEARComponents();
- String[] values = new String[components.length];
- for (int i = 0; i < components.length; i++) {
- values[i] = components[i].getProject().getName();
- }
- if (availableAppsCombo != null) {
- availableAppsCombo.setItems(values);
- IVirtualComponent selected = model.getSelectedEARComponent();
- if (selected != null) {
- int index = Arrays.asList(components).indexOf(selected);
- availableAppsCombo.select(index);
- } else
- availableAppsCombo.clearSelection();
- }
- }
-
- protected void refresh() {
- populateApps();
- tableManager.refresh();
- refreshText();
- }
-
-
- public void refreshText() {
- ClassPathSelection sel = model.getClassPathSelection();
- if( sel != null && classPathText != null )
- classPathText.setText(sel == null ? "" : sel.toString()); //$NON-NLS-1$
- }
-
- /**
- * @see ClasspathModelListener#modelChanged(ClasspathModelEvent)
- */
- public void modelChanged(ClasspathModelEvent evt) {
- if (evt.getEventType() == ClasspathModelEvent.CLASS_PATH_CHANGED) {
- isDirty = true;
- refreshText();
- } else if (evt.getEventType() == ClasspathModelEvent.EAR_PROJECT_CHANGED)
- tableManager.refresh();
- }
-
- public void performDefaults() {
- model.resetClassPathSelection();
- refresh();
- isDirty = false;
- model.dispose();
- }
-
- public boolean performCancel() {
- model.dispose();
- return true;
- }
-
- /**
- * @see IPreferencePage#performOk()
- */
- public boolean performOk() {
- if (!isDirty)
- return true;
- WorkspaceModifyComposedOperation composed = new WorkspaceModifyComposedOperation(createManifestOperation());
- composed.addRunnable(createBuildPathOperation());
-
- WorkspaceModifyComposedOperation op = createJ2EEComponentDependencyOperations();
- if( op != null )
- composed.addRunnable(op);
- try {
- new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
- } catch (InvocationTargetException ex) {
- String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
- String msg = title;
- if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
- msg = ex.getTargetException().getMessage();
- MessageDialog.openError(propPage.getShell(), title, msg);
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- return false;
- } catch (InterruptedException e) {
- // cancelled
- return false;
- } finally {
- model.dispose();
- }
- isDirty = false;
- return true;
- }
-
-// private boolean runWLPOp(WorkspaceModifyComposedOperation composed) {
-// try {
-// if (composed != null)
-// new ProgressMonitorDialog(getShell()).run(true, true, composed);
-// } catch (InvocationTargetException ex) {
-// String title = ManifestUIResourceHandler.getString("An_internal_error_occurred_ERROR_"); //$NON-NLS-1$
-// String msg = title;
-// if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
-// msg = ex.getTargetException().getMessage();
-// MessageDialog.openError(this.getShell(), title, msg);
-// org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-// return false;
-// } catch (InterruptedException e) {
-// // cancelled
-// return false;
-// }
-// return true;
-// }
-
-
- List getUnSelectedClassPathElementsForJ2EEDependency(){
- List unselectedForJ2EE = getUnSelectedClassPathSelection().getClasspathElements();
- List unselected = new ArrayList();
-
- if( model != null && model.getClassPathSelectionForWLPs() != null ){
- List wlpSelected= model.getClassPathSelectionForWLPs().getSelectedClasspathElements();
- java.util.Iterator it = unselectedForJ2EE.iterator();
-
- while( it.hasNext()){
- ClasspathElement element = (ClasspathElement)it.next();
- java.util.Iterator wlpIterator = wlpSelected.iterator();
- boolean found = false;
- while(wlpIterator.hasNext()){
- ClasspathElement wlpElement = (ClasspathElement)wlpIterator.next();
- String text = element.getText();
- int index = text.indexOf(".jar");
- text = text.substring(0, index);
- if( text.equals(wlpElement.getText()) ){
- found = true;
- break;
- }
- }
- if( !found ){
- if( !unselected.contains(element))
- unselected.add(element);
- }
-
- }
- }
- return unselected;
- }
-
-
- List getUnSelectedClassPathElementsForWebDependency(){
- List unselectedForWLP = getUnSelectedClassPathSelectionForWLPs().getClasspathElements();
- List unselected = new ArrayList();
- if( model.getClassPathSelection() != null ){
- List j2eeSelected= model.getClassPathSelection().getSelectedClasspathElements();
- java.util.Iterator it = unselectedForWLP.iterator();
-
- while( it.hasNext()){
- ClasspathElement element = (ClasspathElement)it.next();
- java.util.Iterator j2eeIterator = j2eeSelected.iterator();
- boolean found = false;
- while( j2eeIterator.hasNext() ){
- ClasspathElement j2eeElement = (ClasspathElement)j2eeIterator.next();
- String text = j2eeElement.getText();
- int index = text.indexOf(".jar");
- text = text.substring(0, index);
-
- if( element.getText().equals( text )){
- found = true;
- break;
- }
- }
- if( !found ){
- if( !unselected.contains(element))
- unselected.add(element);
- }
-
- }
- }else{
- unselected = unselectedForWLP;
- }
- return unselected;
- }
-
- protected WorkspaceModifyComposedOperation createJ2EEComponentDependencyOperations() {
- WorkspaceModifyComposedOperation composedOp = null;
- List selected = getSelectedClassPathSelection().getClasspathElements();
- List unselected = getUnSelectedClassPathElementsForJ2EEDependency();
-
- List targetComponentsHandles = new ArrayList();
- for (int i = 0; i < selected.size(); i++) {
- ClasspathElement element = (ClasspathElement) selected.get(i);
- IProject elementProject = element.getProject();
- if( elementProject != null ){
- IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
- targetComponentsHandles.add(targetComp);
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.createReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
- targetComponentsHandles = new ArrayList();
- for (int i = 0; i < unselected.size(); i++) {
- ClasspathElement element = (ClasspathElement) unselected.get(i);
- IProject elementProject = element.getProject();
- if( elementProject != null ){
- if (ModuleCoreNature.isFlexibleProject(elementProject)) {
- IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
- targetComponentsHandles.add(targetComp);
- }
- }else{
- URI archiveURI = element.getArchiveURI();
- if( archiveURI != null && !archiveURI.equals("") ){ //$NON-NLS-1$
- String name = ""; //$NON-NLS-1$
- try {
- String type = ModuleURIUtil.getArchiveType(archiveURI);
- String tmpname = ModuleURIUtil.getArchiveName(archiveURI);
- name = type + IPath.SEPARATOR + tmpname;
- } catch (UnresolveableURIException e) {
- Logger.getLogger().logError(e.getMessage());
- }
- if( !name.equals("")){ //$NON-NLS-1$
- IVirtualReference ref = model.getComponent().getReference(name);
- if( ref != null ){
- IVirtualComponent referenced = ref.getReferencedComponent();
- targetComponentsHandles.add(referenced);
- }
- }
- }
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- if(composedOp == null)
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.removeReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
- return composedOp;
- }
-
-
- protected WorkspaceModifyComposedOperation createComponentDependencyOperations() {
- WorkspaceModifyComposedOperation composedOp = null;
- List selected = getSelectedClassPathSelectionForWLPs().getClasspathElements();
- List unselected = getUnSelectedClassPathElementsForWebDependency();
-
- List targetComponentsHandles = new ArrayList();
- for (int i = 0; i < selected.size(); i++) {
- ClasspathElement element = (ClasspathElement) selected.get(i);
- IProject elementProject = element.getProject();
- if( elementProject != null ){
- IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
- targetComponentsHandles.add(targetComp);
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.createWLPReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
- targetComponentsHandles = new ArrayList();
- for (int i = 0; i < unselected.size(); i++) {
- ClasspathElement element = (ClasspathElement) unselected.get(i);
- IProject elementProject = element.getProject();
- if( elementProject != null ){
- if (ModuleCoreNature.isFlexibleProject(elementProject)) {
- IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
- targetComponentsHandles.add(targetComp);
- }
- }else{
- URI archiveURI = element.getArchiveURI();
- if( archiveURI != null && !archiveURI.equals("") ){ //$NON-NLS-1$
- String name = ""; //$NON-NLS-1$
- try {
- String type = ModuleURIUtil.getArchiveType(archiveURI);
- String tmpname = ModuleURIUtil.getArchiveName(archiveURI);
- name = type + IPath.SEPARATOR + tmpname;
- } catch (UnresolveableURIException e) {
- Logger.getLogger().logError(e.getMessage());
- }
- if( !name.equals("")){ //$NON-NLS-1$
- IVirtualReference ref = model.getComponent().getReference(name);
- IVirtualComponent referenced = ref.getReferencedComponent();
- targetComponentsHandles.add(referenced);
- }
- }
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- if(composedOp == null)
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.removeWLPReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
- return composedOp;
- }
-
- protected WorkspaceModifyComposedOperation createFlexProjectOperations() {
- WorkspaceModifyComposedOperation composedOp = null;
- try {
- Object[] elements = tableManager.availableJARsViewer.getCheckedElements();
- for (int i = 0; i < elements.length; i++) {
- ClasspathElement element = (ClasspathElement) elements[i];
- IProject elementProject = element.getProject();
- if ( elementProject != null && !elementProject.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- if(composedOp == null)
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(elementProject)));
- }
- }
- } catch (CoreException ce) {
- }
- return composedOp;
- }
-
- protected IRunnableWithProgress createBuildPathOperation() {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- return WTPUIPlugin.getRunnableWithProgress(new UpdateJavaBuildPathOperation(javaProject,getSelectedClassPathSelectionForWLPs(), getUnSelectedClassPathElementsForJ2EEDependency()));
- }
-
- protected IRunnableWithProgress createWLPBuildPathOperation() {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- return WTPUIPlugin.getRunnableWithProgress(new UpdateJavaBuildPathOperation(javaProject,getSelectedClassPathSelectionForWLPs(),getUnSelectedClassPathElementsForWebDependency()));
-
- }
-
- protected ClassPathSelection getUnSelectedClassPathSelectionForWLPs() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- List modelElements = model.getClassPathSelectionForWLPs().getClasspathElements();
- for (int i = 0; i < modelElements.size(); i++) {
- List checkedElementsList = Arrays.asList(checkedElements);
- if (!checkedElementsList.contains(modelElements.get(i))) {
- selection.getClasspathElements().add(modelElements.get(i));
- }
- }
- return selection;
- }
-
- private ClassPathSelection getSelectedClassPathSelection() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- for(int i = 0; i < checkedElements.length; i++) {
- selection.getClasspathElements().add(checkedElements[i]);
- }
- return selection;
- }
-
- protected ClassPathSelection getUnSelectedClassPathSelection() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- List modelElements = model.getClassPathSelection().getClasspathElements();
- for (int i = 0; i < modelElements.size(); i++) {
- List checkedElementsList = Arrays.asList(checkedElements);
- if (!checkedElementsList.contains(modelElements.get(i))) {
- selection.getClasspathElements().add(modelElements.get(i));
- }
- }
- return selection;
- }
-
-
- private ClassPathSelection getSelectedClassPathSelectionForWLPs() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- for(int i = 0; i < checkedElements.length; i++) {
- selection.getClasspathElements().add(checkedElements[i]);
- }
- return selection;
- }
-
- protected UpdateManifestOperation createManifestOperation() {
- return new UpdateManifestOperation(project.getName(), model.getClassPathSelection().toString(), true);
- }
-
- protected boolean isReadOnly() {
- return JemProjectUtilities.isBinaryProject(project);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java
deleted file mode 100644
index e70c7e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ManifestErrorPrompter implements ICommonManifestUIConstants {
-
- /**
- * Constructor for ManifestErrorPrompter.
- */
- private ManifestErrorPrompter() {
- super();
- }
-
- public static boolean showManifestException(Shell shell, String baseMessage, boolean includeCancel, Throwable caught) {
- StringBuffer msg = new StringBuffer(baseMessage);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_1);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_2);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_3);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_4);
- return ErrorDialog.openError(shell,
- ERROR_READING_MANIFEST_DIALOG_TITLE,
- msg.toString(),
- caught,
- 0, includeCancel);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java
deleted file mode 100644
index f4814b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java
+++ /dev/null
@@ -1,57 +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.jst.j2ee.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ManifestUIResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "manifest_ui";//$NON-NLS-1$
-
- private ManifestUIResourceHandler() {
- // Do not instantiate
- }
-
- public static String Up_1;
- public static String Down_2;
- public static String Select_All_3;
- public static String Deselect_All_4;
- public static String ERROR_READING_MANIFEST_DIALOG_TITLE;
- public static String SAVE_MANIFEST_WITH_ERROR;
- public static String ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR;
- public static String ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE;
- public static String MANIFEST_PROBLEM_1;
- public static String MANIFEST_PROBLEM_2;
- public static String MANIFEST_PROBLEM_3;
- public static String MANIFEST_PROBLEM_4;
- public static String An_internal_error_occurred_ERROR_;
- public static String Project_name__UI_;
- public static String EAR_Project_Name__UI__UI_;
- public static String Available_dependent_JARs__UI_;
- public static String Manifest_Class_Path__UI_;
- public static String JAR_Module_UI_;
- public static String Project_UI_;
- public static String EAR_Modules;
- public static String EAR_Modules_Desc;
- public static String J2EE_Modules;
- public static String J2EE_Modules_Desc;
- public static String Web_Libraries;
- public static String Web_Libraries_Desc;
- public static String EAR_Module_Dep_Error;
- public static String Jar_Dep_One_Module_Error;
- public static String Web_Lib_Error;
- public static String REDIRECT_TEXT_EDITOR_UI_;
- public static String Error_Checking_Project_Facets;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ManifestUIResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java
deleted file mode 100644
index cdf1c19..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class UpdateManifestOperation implements org.eclipse.jface.operation.IRunnableWithProgress {
- protected String projectName;
- protected String classPathValue;
- protected boolean replace;
-/**
- * UpdateManifestOperation constructor comment.
- */
-public UpdateManifestOperation(String aProjectName, String aSpaceDelimitedPath, boolean replaceInsteadOfMerge) {
- super();
- projectName = aProjectName;
- classPathValue = aSpaceDelimitedPath;
- replace = replaceInsteadOfMerge;
-}
-protected IProject getProject() {
- return J2EEPlugin.getWorkspace().getRoot().getProject(projectName);
-}
-/**
- * Runs this operation. Progress should be reported to the given progress monitor.
- * This method is usually invoked by an <code>IRunnableContext</code>'s <code>run</code> method,
- * which supplies the progress monitor.
- * A request to cancel the operation should be honored and acknowledged
- * by throwing <code>InterruptedException</code>.
- *
- * @param monitor the progress monitor to use to display progress and receive
- * requests for cancelation
- * @exception InvocationTargetException if the run method must propagate a checked exception,
- * it should wrap it inside an <code>InvocationTargetException</code>; runtime exceptions are automatically
- * wrapped in an <code>InvocationTargetException</code> by the calling context
- * @exception InterruptedException if the operation detects a request to cancel,
- * using <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- *
- * @see IRunnableContext#run
- */
-public void run(org.eclipse.core.runtime.IProgressMonitor monitor) throws java.lang.reflect.InvocationTargetException, InterruptedException {
- IProject p = getProject();
- try {
- ArchiveManifest mf = J2EEProjectUtilities.readManifest(p);
- if (mf == null)
- mf = new ArchiveManifestImpl();
- mf.addVersionIfNecessary();
- if (replace)
- mf.setClassPath(classPathValue);
- else
- mf.mergeClassPath(ArchiveUtil.getTokens(classPathValue));
- J2EEProjectUtilities.writeManifest(p, mf);
- } catch (java.io.IOException ex) {
- throw new WFTWrappedException(ex);
- }
-}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java
deleted file mode 100644
index 53cc47d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelListener;
-import org.eclipse.jst.j2ee.internal.common.operations.UpdateJavaBuildPathOperation;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation;
-
-public class WebLibDependencyPropertiesPage extends JARDependencyPropertiesPage implements IClasspathTableOwner, Listener, ClasspathModelListener {
-
- public WebLibDependencyPropertiesPage(final IProject project,
- final J2EEDependenciesPage page) {
- super(project, page);
- }
-
- public Composite createContents(Composite parent) {
- initialize();
- Composite composite = createBasicComposite(parent);
- if( model.getComponent() != null ){
- if (!isValidWebModule())
- return composite;
- J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.Web_Libraries_Desc);
- //createProjectLabelsGroup(composite);
- createListGroup(composite);
- handleWLPSupport();
- model.setWLPModel(true);
- setEnablement();
- }
- return composite;
- }
-
- protected void createProjectLabelsGroup(Composite parent) {
-
- Composite labelsGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- labelsGroup.setLayout(layout);
- labelsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label label = new Label(labelsGroup, SWT.NONE);
- label.setText(ManifestUIResourceHandler.Project_name__UI_);
-
- componentNameText = new Text(labelsGroup, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- componentNameText.setEditable(false);
- componentNameText.setLayoutData(data);
- componentNameText.setText(project.getName());
- }
-
- protected void createListGroup(Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- listGroup.setLayout(layout);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.horizontalIndent = 5;
- listGroup.setLayoutData(gData);
-
- availableDependentJars = new Label(listGroup, SWT.NONE);
- gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- availableDependentJars.setText(ManifestUIResourceHandler.Available_dependent_JARs__UI_);
- availableDependentJars.setLayoutData(gData);
- createTableComposite(listGroup);
- }
-
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- tableManager = new ClasspathTableManager(this, model, validateEditListener);
- tableManager.setReadOnly(isReadOnly());
- tableManager.fillWLPComposite(composite);
- }
-
- protected boolean isValidWebModule() {
- if (!J2EEProjectUtilities.isDynamicWebProject(project)) {
- propPage.setErrorMessage(ManifestUIResourceHandler.Web_Lib_Error);
- return false;
- }
- return true;
- }
-
- protected void setEnablement() {
- if (tableManager.availableJARsViewer.getTable().getItems().length == 0) {
- tableManager.selectAllButton.setEnabled(false);
- tableManager.deselectAllButton.setEnabled(false);
- } else {
- tableManager.selectAllButton.setEnabled(true);
- tableManager.deselectAllButton.setEnabled(true);
- }
- }
-
- private void handleWLPSupport() {
- tableManager.setWLPEntry(true);
- availableDependentJars.setText("Select utility projects to add as Web Library projects to the web module"); //$NON-NLS-1$
- tableManager.refresh();
- }
-
- public boolean performOk() {
- if( model.getComponent() == null || !isValidWebModule()){
- return true;
- }
- if (!isDirty) {
- return true;
- }
- try {
- boolean createdFlexProjects = runWLPOp(createFlexProjectOperations());
- boolean createdComponentDependency = false;
- if (createdFlexProjects)
- createdComponentDependency = runWLPOp(createComponentDependencyOperations());
- boolean createdBuildPathSettings = false;
- if (createdComponentDependency) {
- WorkspaceModifyComposedOperation composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(createWLPBuildPathOperation());
- createdBuildPathSettings = runWLPOp(composedOp);
- }
- isDirty = false;
- return createdBuildPathSettings;
- } finally {
- model.dispose();
- }
- }
-
- private boolean runWLPOp(WorkspaceModifyComposedOperation composed) {
- try {
- if (composed != null)
- new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
- } catch (InvocationTargetException ex) {
- String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
- String msg = title;
- if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
- msg = ex.getTargetException().getMessage();
- MessageDialog.openError(propPage.getShell(), title, msg);
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- return false;
- } catch (InterruptedException e) {
- // cancelled
- return false;
- }
- return true;
- }
- public void handleSelectExternalJarButton(){
-
- if (J2EEProjectUtilities.isDynamicWebProject(project)){
-
- IPath[] selected= BuildPathDialogAccess.chooseExternalJAREntries(propPage.getShell());
-
- if (selected != null) {
- for (int i= 0; i < selected.length; i++) {
-
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
-// String name = selected[i].toString();
-
-// java.io.File file = new java.io.File(name);
- IVirtualComponent archive = ComponentCore.createArchiveComponent( model.getComponent().getProject(), type +
- selected[i].toString());
-
- ArrayList vlist = new ArrayList();
- IVirtualReference[] oldrefs = model.getComponent().getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- vlist.add(ref);
- }
-
- //To do: check if archive component already exists
- IVirtualReference ref = ComponentCore.createReference( model.getComponent(), archive, new Path("/WEB-INF/lib") ); //$NON-NLS-1$
- vlist.add(ref);
-
- IVirtualReference[] refs = new IVirtualReference[vlist.size()];
- for (int j = 0; j < vlist.size(); j++) {
- IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
- refs[j] = tmpref;
- }
- model.getComponent().setReferences(refs);
-
-
- //ClasspathElement element = createClassPathElement(archive, file.getName());
- ClasspathElement element = createClassPathElement(archive, archive.getName());
- ClassPathSelection selection = createClassPathSelectionForExternalJar(element);
- createBuildPathOperationForExternalJar(selection);
-
- WorkspaceModifyComposedOperation composed = new WorkspaceModifyComposedOperation(createBuildPathOperationForExternalJar(selection));
- try {
- new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
- } catch (InvocationTargetException ex) {
- String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
- String msg = title;
- if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
- msg = ex.getTargetException().getMessage();
- MessageDialog.openError(propPage.getShell(), title, msg);
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-
- } catch (InterruptedException e) {
- // cancelled
-
- }
- model.getClassPathSelectionForWLPs().getClasspathElements().add(element);
- }
-
- refresh();
- }
- }
-
- }
-
- public void handleSelectVariableButton(){
-
- if (J2EEProjectUtilities.isDynamicWebProject(project)){
- IPath existingPath[] = new Path[0];
- IPath[] paths = BuildPathDialogAccess.chooseVariableEntries(propPage.getShell(), existingPath);
-
- if (paths != null) {
- for (int i = 0; i < paths.length; i++) {
- IPath resolvedPath= JavaCore.getResolvedVariablePath(paths[i]);
-
- java.io.File file = new java.io.File(resolvedPath.toOSString());
- if( file.isFile() && file.exists()){
- String type = VirtualArchiveComponent.VARARCHIVETYPE + IPath.SEPARATOR;
-
- IVirtualComponent archive = ComponentCore.createArchiveComponent( model.getComponent().getProject(), type +
- paths[i].toString());
-
- ArrayList vlist = new ArrayList();
- IVirtualReference[] oldrefs = model.getComponent().getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- vlist.add(ref);
- }
-
- //To do: check if archive component already exists
- IVirtualReference ref = ComponentCore.createReference( model.getComponent(), archive, new Path("/WEB-INF/lib") ); //$NON-NLS-1$
- vlist.add(ref);
-
- IVirtualReference[] refs = new IVirtualReference[vlist.size()];
- for (int j = 0; j < vlist.size(); j++) {
- IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
- refs[j] = tmpref;
- }
- model.getComponent().setReferences(refs);
-
- //ClasspathElement element = createClassPathElement(archive, file.getName());
- ClasspathElement element = createClassPathElement(archive, archive.getName());
-
- ClassPathSelection selection = createClassPathSelectionForExternalJar(element);
- createBuildPathOperationForExternalJar(selection);
-
- WorkspaceModifyComposedOperation composed = new WorkspaceModifyComposedOperation(createBuildPathOperationForExternalJar(selection));
- try {
- new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
- } catch (InvocationTargetException ex) {
- String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
- String msg = title;
- if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
- msg = ex.getTargetException().getMessage();
- MessageDialog.openError(propPage.getShell(), title, msg);
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-
- } catch (InterruptedException e) {
- // cancelled
-
- }
- model.getClassPathSelectionForWLPs().getClasspathElements().add(element);
-
- }else{
- //display error
- }
-
- }
- refresh();
- }
- }
- }
-
- private ClasspathElement createClassPathElement(IVirtualComponent archiveComp,
- String unresolvedName ) {
-
- URI uri = URI.createURI(ModuleURIUtil.getHandleString(archiveComp));
- ClasspathElement element = new ClasspathElement(uri);
- element.setValid(false);
- element.setSelected(true);
- element.setRelativeText(unresolvedName);
- element.setText(unresolvedName);
- element.setEarProject(null);
- return element;
- }
-
- private ClassPathSelection createClassPathSelectionForExternalJar(ClasspathElement element){
- ClassPathSelection selection = new ClassPathSelection();
- selection.getClasspathElements().add(element);
- return selection;
- }
- private ClassPathSelection createClassPathSelectionForProjectJar(ClasspathElement element){
- ClassPathSelection selection = new ClassPathSelection();
- selection.getClasspathElements().add(element);
- return selection;
- }
-
-
- protected IRunnableWithProgress createBuildPathOperationForExternalJar(ClassPathSelection selection) {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- return WTPUIPlugin.getRunnableWithProgress(new UpdateJavaBuildPathOperation(javaProject, selection));
- }
-
- public void handleSelectProjectJarButton(){
-
- if (J2EEProjectUtilities.isDynamicWebProject(project)){
-
- IPath[] selected= BuildPathDialogAccess.chooseJAREntries(propPage.getShell(), project.getLocation(), new IPath[0]);
-
- if (selected != null) {
- for (int i= 0; i < selected.length; i++) {
-
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- // String name = selected[i].toString();
-
- //IPath fullPath = project.getFile(selected[i]).getFullPath();
- IVirtualComponent archive = ComponentCore.createArchiveComponent( model.getComponent().getProject(), type +
- selected[i].makeRelative().toString());
-
- ArrayList vlist = new ArrayList();
- IVirtualReference[] oldrefs = model.getComponent().getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- vlist.add(ref);
- }
-
- //To do: check if archive component already exists
- IVirtualReference ref = ComponentCore.createReference( model.getComponent(), archive, new Path("/WEB-INF/lib") ); //$NON-NLS-1$
- vlist.add(ref);
-
- IVirtualReference[] refs = new IVirtualReference[vlist.size()];
- for (int j = 0; j < vlist.size(); j++) {
- IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
- refs[j] = tmpref;
- }
- model.getComponent().setReferences(refs);
-
-
- //ClasspathElement element = createClassPathElement(archive, file.getName());
- ClasspathElement element = createClassPathElement(archive, archive.getName());
- ClassPathSelection selection = createClassPathSelectionForProjectJar(element);
- createBuildPathOperationForExternalJar(selection);
-
- WorkspaceModifyComposedOperation composed = new WorkspaceModifyComposedOperation(createBuildPathOperationForExternalJar(selection));
- try {
- new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
- } catch (InvocationTargetException ex) {
- String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
- String msg = title;
- if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
- msg = ex.getTargetException().getMessage();
- MessageDialog.openError(propPage.getShell(), title, msg);
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-
- } catch (InterruptedException e) {
- // cancelled
-
- }
- model.getClassPathSelectionForWLPs().getClasspathElements().add(element);
- }
-
- refresh();
- }
- }
-
- }
-
-// private void enableExternalJarControls(boolean b) {
-// tableManager.externalJarButton.setVisible(b);
-// tableManager.addVariableButton.setVisible(b);
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index f0c7021..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.ui.actions.WorkspaceModifyOperation {
-
- protected List fRunnables;
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
- super(rule);
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- */
- public WorkspaceModifyComposedOperation() {
- super();
- }
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
- super(rule);
- fRunnables = nestedRunnablesWithProgress;
- }
-
- public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
- super();
- fRunnables = nestedRunnablesWithProgress;
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- *
- * @param content
- * the runnable to delegate to when this operation is executed
- */
- public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
- super();
- getRunnables().add(nestedOp);
- }
-
- public boolean addRunnable(IRunnableWithProgress nestedOp) {
- return getRunnables().add(nestedOp);
- }
-
- protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- int size = fRunnables.size();
- monitor.beginTask("", size);//$NON-NLS-1$
- for (int i = 0; i < fRunnables.size(); i++) {
- IRunnableWithProgress op = (IRunnableWithProgress) fRunnables.get(i);
- op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
- }
- }
-
- protected List getRunnables() {
- if (fRunnables == null)
- fRunnables = new ArrayList(3);
- return fRunnables;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java
deleted file mode 100644
index 9d9a71e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java
+++ /dev/null
@@ -1,225 +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.jst.j2ee.internal.actions;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public abstract class AbstractActionDelegate implements org.eclipse.ui.IActionDelegate {
- protected ISelection selection;
- protected boolean allowsMultiSelect = false;
- public static final Class IPROJECT_CLASS = IProject.class;
- private final static String ERROR_OCCURRED_TITLE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_TITLE"); //$NON-NLS-1$
- private final static String ERROR_OCCURRED_MESSAGE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_MESSAGE"); //$NON-NLS-1$
-
- /**
- * EditModuleDependencyAction constructor comment.
- */
- public AbstractActionDelegate() {
- super();
- }
-
- /**
- * Applicable only when this action does not allow multi select
- */
- protected IProject getProject() {
- return getProject(getSelectedElement());
- }
-
- protected List getProjects() {
- if ((selection == null) || !(selection instanceof IStructuredSelection))
- return Collections.EMPTY_LIST;
-
- List result = new ArrayList();
- IStructuredSelection struct = (IStructuredSelection) selection;
- Iterator it = struct.iterator();
- while (it.hasNext()) {
- IProject p = getProject(it.next());
- if (p != null)
- result.add(p);
- }
- return result;
- }
-
- protected IProject getProject(Object element) {
-
- if (isSupportedAction(element))
- return ProjectUtilities.getProject((EObject) element);
- else if (element instanceof IAdaptable)
- return (IProject) ((IAdaptable) element).getAdapter(IPROJECT_CLASS);
- else
- return null;
- }
-
- protected IStructuredSelection getStructuredSelection() {
- if ((selection == null) || !(selection instanceof IStructuredSelection))
- return null;
- else if (selection.isEmpty()) {
- selection = J2EEUIPlugin.getCurrentSelection();
- }
- return (IStructuredSelection) selection;
- }
-
- /*
- * Only return if there is exactly one item selected
- */
- protected Object getSelectedElement() {
- IStructuredSelection sel = getStructuredSelection();
- return sel == null ? null : sel.getFirstElement();
- }
-
- protected IWorkbenchWindow getWorkbenchWindow() {
- return J2EEUIPlugin.getActiveWorkbenchWindow();
- }
-
- /**
- * Can the receiver be executed for
- *
- * @element
- */
- protected abstract boolean isSupportedAction(Object element);
-
- /**
- * @deprecated use {@link #primRun(Shell)}
- */
- protected void primRun(IProject project, Shell shell) {
- //Deprecated
- }
-
- /**
- * Subclasses should override this instead of {@link #run(org.eclipse.jface.action.IAction)}
- */
- protected void primRun(Shell shell) {
- primRun(getProject(), shell);
- }
-
- /**
- * Performs this action.
- * <p>
- * This method is called when the delegating action has been triggered. Implement this method to
- * do the actual work.
- * </p>
- *
- * @param action
- * the action proxy that handles the presentation portion of the action
- */
- public void run(org.eclipse.jface.action.IAction action) {
-
- Shell shell = getWorkbenchWindow().getShell();
- setActionStateFromProjects(action);
- if (!action.isEnabled())
- MessageDialog.openInformation(shell, J2EEUIMessages.getResourceString("INFORMATION_UI_"), J2EEUIMessages.getResourceString("CHOSEN_OP_NOT_AVAILABLE")); //$NON-NLS-2$ = "The chosen operation is not currently available." //$NON-NLS-1$ = "Information"
- else {
- try {
- primRun(shell);
- } catch (Throwable t) {
- org.eclipse.jst.j2ee.internal.plugin.ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
- }
- }
-
-
- }
-
- /**
- * Notifies this action delegate that the selection in the workbench has changed.
- * <p>
- * Implementers can use this opportunity to change the availability of the action or to modify
- * other presentation properties.
- * </p>
- *
- * @param action
- * the action proxy that handles presentation portion of the action
- * @param aSelection
- * the current selection in the workbench
- */
- public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection aSelection) {
- this.selection = aSelection;
- setActionState(action);
- }
-
- protected void setActionState(IAction action) {
- if (allowsMultiSelect)
- setActionStateForMultiSelect(action);
- else
- setActionStateForSingleSelect(action);
- }
-
- protected void setActionStateForSingleSelect(IAction action) {
- IStructuredSelection sel = getStructuredSelection();
- if (sel == null || sel.size() != 1) {
- action.setEnabled(false);
- return;
- }
- setActionStateFromProjects(action);
- }
-
- protected void setActionStateForMultiSelect(IAction action) {
- setActionStateFromProjects(action);
- }
-
- protected void setActionStateFromProjects(IAction action) {
- IStructuredSelection sel = getStructuredSelection();
- boolean allOk = false;
- if (sel != null && !sel.isEmpty()) {
- allOk = true;
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- IProject project = getProject(o);
- if (project == null || !project.isOpen()) {
- allOk = false;
- break;
- }
- }
- }
- action.setEnabled(allOk);
- }
-
- /**
- * Returns the allowsMultiSelect.
- *
- * @return boolean
- */
- public boolean allowsMultiSelect() {
- return allowsMultiSelect;
- }
-
-
- /**
- * Sets the allowsMultiSelect.
- *
- * @param allowsMultiSelect
- * The allowsMultiSelect to set
- */
- public void setAllowsMultiSelect(boolean allowsMultiSelect) {
- this.allowsMultiSelect = allowsMultiSelect;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java
deleted file mode 100644
index 1dbce3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java
+++ /dev/null
@@ -1,69 +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.jst.j2ee.internal.actions;
-
-
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-
-
-public abstract class AbstractActionWithDelegate extends org.eclipse.ui.actions.SelectionListenerAction {
- protected IActionDelegate delegate;
-
- /**
- * EditModuleDependencyAction constructor comment.
- *
- * @param text
- * java.lang.String
- */
- public AbstractActionWithDelegate() {
- super("");//$NON-NLS-1$
- initLabel();
- initDelegate();
- }
-
- protected abstract IActionDelegate createDelegate();
-
- protected abstract String getLabel();
-
- protected void initDelegate() {
- delegate = createDelegate();
- }
-
- protected void initLabel() {
- setText(getLabel());
- }
-
- /**
- * Implementation of method defined on <code>IAction</code>.
- */
- public void run() {
- delegate.run(this);
- }
-
- /**
- * Updates this action in response to the given selection.
- * <p>
- * The <code>SelectionListenerAction</code> implementation of this method returns
- * <code>true</code>. Subclasses may extend to react to selection changes; however, if the
- * super method returns <code>false</code>, the overriding method must also return
- * <code>false</code>.
- * </p>
- *
- * @param selection
- * the new selection
- * @return <code>true</code> if the action should be enabled for this selection, and
- * <code>false</code> otherwise
- */
- protected boolean updateSelection(IStructuredSelection selection) {
- delegate.selectionChanged(this, selection);
- return this.isEnabled();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java
deleted file mode 100644
index 249a671..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java
+++ /dev/null
@@ -1,122 +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.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.SelectionListenerAction;
-
-/**
- * Action for opening a J2EE resource from the J2EE navigator.
- */
-public abstract class AbstractOpenAction extends SelectionListenerAction implements IActionDelegate2 {
- // //$NON-NLS-1$
- protected IEditorDescriptor currentDescriptor;
- protected Object srcObject;
-
- protected AbstractOpenAction(String text) {
- super(text);
- }
-
- protected static IEditorDescriptor findEditorDescriptor(String id) {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- return registry.findEditor(id);
- }
-
- protected void setAttributesFromDescriptor() {
- if (currentDescriptor == null)
- return;
- setText(currentDescriptor.getLabel());
- setToolTipText(currentDescriptor.getLabel());
- setImageDescriptor(currentDescriptor.getImageDescriptor());
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should override this method
- * to react to the change. Returns true if the action should be enabled for this selection, and
- * false otherwise.
- *
- * When this method is overridden, the super method must always be invoked. If the super method
- * returns false, this method must also return false.
- *
- * @param sel
- * the new structured selection
- */
- public boolean updateSelection(IStructuredSelection s) {
- srcObject = null;
- if (!super.updateSelection(s))
- return false;
-
- if (s.size() != 1)
- return false;
-
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- //Dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- //init
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- runWithEvent(event);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- // TODO Auto-generated method stub
- run();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- // TODO HACK!
- updateSelection((IStructuredSelection) selection);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java
deleted file mode 100644
index d652982..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java
+++ /dev/null
@@ -1,147 +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.jst.j2ee.internal.actions;
-
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-
-
-public abstract class AbstractOpenWizardAction extends org.eclipse.jface.action.Action {
- // //$NON-NLS-1$
-
- private IWorkbench fWorkbench;
-
- private Class[] fActivatedOnTypes;
-
- private boolean fAcceptEmptySelection;
-
- protected AbstractOpenWizardAction() {
- //Default constructor
- }
-
- public AbstractOpenWizardAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
- super(label);
- fWorkbench = workbench;
- fActivatedOnTypes = activatedOnTypes;
- fAcceptEmptySelection = acceptEmptySelection;
- }
-
- public AbstractOpenWizardAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
- this(workbench, label, null, acceptEmptySelection);
- }
-
- public boolean canActionBeAdded() {
- ISelection selection = getCurrentSelection();
- if (selection == null || selection.isEmpty()) {
- return fAcceptEmptySelection;
- }
- if (fActivatedOnTypes != null) {
- if (selection instanceof IStructuredSelection) {
- return isEnabled(((IStructuredSelection) selection).iterator());
- }
- return false;
- }
- return true;
- }
-
- /**
- * Create the specific Wizard (to be implemented by a subclass)
- */
- abstract protected Wizard createWizard();
-
- protected IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
-
- }
- return null;
- }
-
- protected IWorkbench getWorkbench() {
- return fWorkbench;
- }
-
- private boolean isEnabled(Iterator iter) {
- while (iter.hasNext()) {
- Object obj = iter.next();
- if (!isOfAcceptedType(obj) || !shouldAcceptElement(obj)) {
- return false;
- }
- }
- return true;
- }
-
- private boolean isOfAcceptedType(Object obj) {
- for (int i = 0; i < fActivatedOnTypes.length; i++) {
- if (fActivatedOnTypes[i].isInstance(obj)) {
- return true;
- }
- }
- return false;
- }
-
- protected String getDialogText() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_LBL);
- }
-
- /**
- * The user has invoked this action.
- */
- public void run() {
- Wizard wizard = createWizard();
- if (wizard instanceof IWorkbenchWizard) {
- IStructuredSelection sel = null;
- if (null != getCurrentSelection())
- sel = getCurrentSelection();
- else
- sel = new StructuredSelection();
- ((IWorkbenchWizard) wizard).init(J2EEUIPlugin.getDefault().getWorkbench(), sel);
- }
- if (WorkbenchActivityHelper.allowUseOf(null,wizard)) {
- IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
- dialog.create();
- String text = getDialogText();
- if (null != text) {
- dialog.getShell().setText(text);
- }
- dialog.open();
- }
- }
-
- protected void setWorkbench(IWorkbench workbench) {
- fWorkbench = workbench;
- }
-
- /**
- * can be overridden to add more checks obj is guaranteed to be instance of one of the accepted
- * types
- */
- protected boolean shouldAcceptElement(Object obj) {
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java
deleted file mode 100644
index 5c70936..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java
+++ /dev/null
@@ -1,61 +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.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public abstract class AbstractOpenWizardWorkbenchAction extends AbstractOpenWizardAction implements org.eclipse.ui.IWorkbenchWindowActionDelegate {
- protected AbstractOpenWizardWorkbenchAction() {
- //Default
- }
-
- public AbstractOpenWizardWorkbenchAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
- super(workbench, label, null, acceptEmptySelection);
- }
-
- public AbstractOpenWizardWorkbenchAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
- super(workbench, label, null, acceptEmptySelection);
- }
-
- /**
- * @see AbstractOpenWizardAction#dispose
- */
- public void dispose() {
- // do nothing.
- setWorkbench(null);
- }
-
- /**
- * @see AbstractOpenWizardAction#init
- */
- public void init(IWorkbenchWindow window) {
- setWorkbench(window.getWorkbench());
- }
-
- /**
- * @see IActionDelegate#run
- */
- public void run(IAction action) {
- run();
- }
-
- /**
- * @see IActionDelegate#selectionChanged
- */
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing. Action doesn't depend on selection.
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java
deleted file mode 100644
index 853a940..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java
+++ /dev/null
@@ -1,121 +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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public abstract class BaseAction extends Action implements IActionDelegate {
-
- private final static String ERROR_OCCURRED_TITLE = "!!!!Error"; //$NON-NLS-1$
-
- private final static String ERROR_OCCURRED_MESSAGE = "!!@!!Error"; //$NON-NLS-1$
-
- protected IStructuredSelection selection = null;
-
- protected IWorkbenchWindow getWorkbenchWindow() {
- return J2EEUIPlugin.getPluginWorkbench().getActiveWorkbenchWindow();
- }
-
- public void setSelection(IStructuredSelection selection) {
- this.selection = selection;
- }
-
- public void run() {
- Shell shell = getWorkbenchWindow().getShell();
- if (null == selection) {
- ISelection autoselection = getWorkbenchWindow().getSelectionService().getSelection();
- if (autoselection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection) autoselection;
- }
-
- try {
- primRun(shell);
- this.selection = null;
- } catch (Throwable t) {
- ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
- }
-
- }
-
- protected abstract void primRun(Shell shell);
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- //dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- //init
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection aSelection) {
- setSelection((IStructuredSelection) aSelection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- run();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- run();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java
deleted file mode 100644
index a7c9aab..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java
+++ /dev/null
@@ -1,63 +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.jst.j2ee.internal.actions;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-
-/**
- * Insert the type's description here. Creation date: (9/6/2001 12:23:02 PM)
- *
- * @author: Administrator
- */
-public interface IJ2EEUIContextIds {
- // New creation wizards
- public static final String NEW_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_NEW_EAR_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_EAR_ADD_MODULES_PAGE = J2EEUIPlugin.PLUGIN_ID + ".NEW_EAR_ADD_MODULES_PAGE"; //$NON-NLS-1$
- public static final String NEW_EAR_COMP_PAGE = J2EEUIPlugin.PLUGIN_ID + ".NEW_EAR_COMP_PAGE"; //$NON-NLS-1$
- public static final String EAR_NEW_MODULE_PROJECTS_PAGE = J2EEUIPlugin.PLUGIN_ID + ".EAR_NEW_MODULE_PROJECTS_PAGE"; //$NON-NLS-1$
- public static final String NEW_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_APPCLIENT_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3"; //$NON-NLS-1$
- public static final String NEW_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_EJB_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE2"; //$NON-NLS-1$
- public static final String NEW_EJB_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE3"; //$NON-NLS-1$
- public static final String NEW_CONNECTOR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".JCA_NEWIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_CONNECTOR_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".JCA_NEWIZARD_PAGE3"; //$NON-NLS-1$
- public static final String NEW_JAVA_COMPONENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_JAVA_COMPONENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_JAVA_CLASS_OPTION_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_JAVA_CLASS_OPTION_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_UTILITY_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_UTILITY_WIZARD_P1"; //$NON-NLS-1$
- public static final String NEW_UTILITY_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".NEW_UTILITY_WIZARD_P3"; //$NON-NLS-1$
-
-
- // Import, export wizards
- public static final String IMPORT_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_EAR_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE2"; //$NON-NLS-1$
- public static final String IMPORT_EAR_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE3"; //$NON-NLS-1$
- public static final String IMPORT_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_IMPORT_EJB_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_RAR_WIZARD_PAGE = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_RAR_WIZARD_PAGE"; //$NON-NLS-1$
- public static final String IMPORT_UTILITY_JAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_UTILITY_JAR_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_UTILITY_JAR_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_UTILITY_JAR_WIZARD_PAGE2"; //$NON-NLS-1$
- public static final String IMPORT_CLASS_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_CLASS_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_CLASS_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_CLASS_WIZARD_PAGE2"; //$NON-NLS-1$
-
- public static final String EXPORT_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_EXPORT_PAGE1"; //$NON-NLS-1$
- public static final String EXPORT_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_EXPORT_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String EXPORT_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_EXPORT_PAGE1"; //$NON-NLS-1$
- public static final String EXPORT_RAR_WIZARD_PAGE = J2EEUIPlugin.PLUGIN_ID + ".EXPORT_RAR_WIZARD_PAGE"; //$NON-NLS-1$
-
- // dialogs
- public static final String DELEATE_EAR_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm2000"; //$NON-NLS-1$
- public static final String DELEATE_MODULE_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm2010"; //$NON-NLS-1$
- public static final String RENAME_EAR_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm3000"; //$NON-NLS-1$
- public static final String RENAME_MODULE_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm3010"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ImportClassesAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ImportClassesAction.java
deleted file mode 100644
index abff486..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ImportClassesAction.java
+++ /dev/null
@@ -1,63 +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
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportClassesAction extends WTPBaseAction {
-
- public static String LABEL = J2EEUIMessages.getResourceString("Import_Classes"); //$NON-NLS-1$
-
- public ImportClassesAction() {
- super();
- setText(LABEL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- protected void primRun(Shell shell) {
- IProject project = ProjectUtilities.getProject(getSelection().getFirstElement());
- ClassesImportWizard wizard = new ClassesImportWizard(project);
-
-
- wizard.init(PlatformUI.getWorkbench(), StructuredSelection.EMPTY);
- wizard.setDialogSettings(J2EEUIPlugin.getDefault().getDialogSettings());
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
-
- dialog.create();
- dialog.getShell().setSize(550, 550);
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java
deleted file mode 100644
index 6697cf6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java
+++ /dev/null
@@ -1,421 +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.jst.j2ee.internal.actions;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.jst.j2ee.internal.dialogs.DeleteEARDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.DeleteModuleDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EEDeleteDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EEDeleteUIConstants;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.actions.DeleteResourceAction;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class J2EEDeleteAction extends SelectionDispatchAction implements J2EEDeleteUIConstants {
-
- protected Shell shell;
- //Used for EAR delete
- protected Set referencedProjects;
- protected List projects;
- protected DeleteOptions options;
- // added for IRefactoringAction behavior
- protected ISelectionProvider provider = null;
-
-
-
- /**
- * Constructor for DeleteModuleAction.
- *
- * @param text
- */
- public J2EEDeleteAction(IWorkbenchSite site, Shell parent) {
- super(site);
- setText(DELETE);
- shell = parent;
- }
-
- public J2EEDeleteAction(IWorkbenchSite site, ISelectionProvider newProvider) {
- super(site);
- setText(DELETE);
- shell = J2EEUIPlugin.getActiveWorkbenchWindow().getShell();
- provider = newProvider;
- }
-
- protected void reset() {
- referencedProjects = null;
- projects = null;
- options = null;
- }
-
- protected boolean getEnableStateBasedOnSelection(IStructuredSelection selection) {
- if (selection.isEmpty())
- return false;
- return isSelectionApplicable() && isSelectionSomeJ2EE();
- }
-
- /**
- * @see SelectionListenerAction#updateSelection(IStructuredSelection)
- */
- protected void updateSelection(IStructuredSelection selection) {
- update(selection);
- }
-
- protected boolean isSelectionApplicable() {
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- if (!isJ2EEModule(o) && !isApplication(o) && !isProjectOrJavaProject(o))
- return false;
- }
- return true;
- }
-
- protected boolean isSelectionSomeJ2EE() {
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- if (isJ2EEModule(o) || isApplication(o))
- return true;
- }
- return false;
- }
-
-
- protected boolean isSelectionAllDDRoots() {
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- if (!isJ2EEModule(o))
- return false;
- }
- return true;
- }
-
- protected boolean isSelectionAllApplications() {
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- if (!isApplication(o))
- return false;
- }
- return true;
- }
-
- protected boolean isJ2EEModule(Object o) {
- //TODO switch to virtual comp
-// if (o instanceof WorkbenchComponent) {
-// WorkbenchComponent module = (WorkbenchComponent) o;
-// String moduleType = module.getComponentType().getComponentTypeId();
-// //TODO need to add connector, app client, ear, ejb client
-// return moduleType.equals(IModuleConstants.JST_WEB_MODULE) || moduleType.equals(IModuleConstants.JST_EJB_MODULE);
-// }
- return CommonUtil.isDeploymentDescriptorRoot(o, false);
- }
-
- protected boolean isApplication(Object o) {
- return (o instanceof Application) || isJ2EEApplicationProject(o);
- }
-
- protected boolean isProjectOrJavaProject(Object o) {
- return (o instanceof IProject) || (o instanceof IJavaProject);
- }
-
- protected List getProjects() {
- if (projects == null) {
- projects = new ArrayList();
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator iterator = sel.iterator();
- IProject project = null;
- Object o = null;
- while (iterator.hasNext()) {
- o = iterator.next();
- if (o instanceof IJavaProject)
- o = ((IJavaProject) o).getProject();
- if (o instanceof IProject) {
- projects.add(o);
- addEJBClientProjectIfNecessary((IProject) o, projects);
- } else if (o instanceof EObject) {
- EObject obj = (EObject) o;
- project = ProjectUtilities.getProject(obj);
- if (project == null)
- throw new RuntimeException(J2EEUIMessages.getResourceString("Project_should_not_be_null_1_EXC_")); //$NON-NLS-1$
- projects.add(project);
- addEJBClientProjectIfNecessary(project, projects);
- } else {
- throw new RuntimeException(J2EEUIMessages.getResourceString("Non-project_in_selection_2_EXC_")); //$NON-NLS-1$
- }
- }
- }
- return projects;
- }
-
- /**
- * @param project
- * @param localProjects
- */
- private void addEJBClientProjectIfNecessary(IProject project, List localProjects) {
- IVirtualComponent comp = ComponentCore.createComponent(project);
- EJBArtifactEdit edit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
- if (edit != null && edit.hasEJBClientJARProject())
- localProjects.add(edit.getEJBClientJarModule().getProject());
- }
-
- /**
- * @see IAction#run()
- */
- public void run() {
- try {
- J2EEDeleteDialog dlg = null;
- if (isSelectionAllApplications())
- dlg = new DeleteEARDialog(shell, getReferencedProjects());
- else if (isSelectionAllDDRoots())
- dlg = new DeleteModuleDialog(shell);
- else {
- if (confirmStandardDelete())
- runResourceDeleteAction();
- return;
- }
-
- dlg.open();
- if (dlg.getReturnCode() == Window.CANCEL)
- return;
- options = dlg.getDeleteOptions();
- if (options != null)
- options.setSelectedProjects(getProjects());
- else
- return;
- if (!(ensureEditorsSaved() && validateState()))
- return;
- deleteProjectsIfNecessary();
- deleteMetadataIfNecessary();
- presentStatusIfNeccessary();
- } finally {
- reset();
- }
- }
-
- private boolean ensureEditorsSaved() {
- return CommonEditorUtility.promptToSaveAllDirtyEditors();
- }
-
- protected boolean confirmStandardDelete() {
- return MessageDialog.openConfirm(shell, DELETE_PROJECTS, CUSTOM_DELETE_MIX_MATCH);
- }
-
- protected Set getReferencedProjects() {
- if (referencedProjects == null)
- computeReferencedProjects();
- return referencedProjects;
- }
-
- protected void computeReferencedProjects() {
- //TODO fix up to use components
-// getProjects();
-// referencedProjects = new HashSet();
-// for (int i = 0; i < projects.size(); i++) {
-// IProject project = (IProject) projects.get(i);
-// EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
-// if (runtime == null)
-// continue;
-// EAREditModel editModel = runtime.getEarEditModelForRead(this);
-// try {
-// referencedProjects.addAll(editModel.getModuleMappedProjects());
-// } finally {
-// editModel.releaseAccess(this);
-// }
-// }
- }
-
-// protected DeleteModuleOperation getDeleteModuleOperation() {
-// if (deleteModuleOperation == null)
-// deleteModuleOperation = new DeleteModuleOperation(options);
-// return deleteModuleOperation;
-// }
-
- protected void deleteMetadataIfNecessary() {
- if (!shouldDeleteMetaData())
- return;
-
-// IRunnableWithProgress runnable = WTPUIPlugin.getRunnableWithProgress(getDeleteModuleOperation());
-// ProgressMonitorDialog monitorDialog = new ProgressMonitorDialog(shell);
-//
-// try {
-// monitorDialog.run(false, false, runnable);
-// } catch (InvocationTargetException e) {
-// handleException(e);
-// } catch (InterruptedException e) {
-// //Ignore
-// }
- }
-
- protected boolean shouldDeleteMetaData() {
- if (deleteProjectsFailedOrCancelled())
- return false;
- return primShouldDeleteMetaData();
- }
-
- protected boolean primShouldDeleteMetaData() {
- return options != null && (options.shouldDeleteModules() || options.shouldDeleteModuleDependencies());
- }
-
- protected boolean deleteProjectsFailedOrCancelled() {
- if (options == null || !options.shouldDeleteProjects())
- return false;
- return deletedProjectsExist();
- }
-
- protected boolean deletedProjectsExist() {
- List deletedProjects = options.getAllProjectsToDelete();
- for (int i = 0; i < deletedProjects.size(); i++) {
- IProject project = (IProject) deletedProjects.get(i);
- if (project.exists())
- return true;
- }
- return false;
- }
-
- protected void deleteProjectsIfNecessary() {
- if (options.shouldDeleteProjects())
- runResourceDeleteAction();
- }
-
- protected void runResourceDeleteAction() {
- DeleteResourceAction action = new DeleteResourceAction(shell);
- List localProjects = null;
- if (options == null)
- localProjects = getProjects();
- else
- localProjects = options.getAllProjectsToDelete();
- Iterator it = localProjects.iterator();
- while (it.hasNext()) {
- IProject p = (IProject) it.next();
- if (!p.exists())
- it.remove();
- }
- IStructuredSelection sel = new StructuredSelection(localProjects);
- action.selectionChanged(sel);
- action.run();
- }
-
- public void handleException(InvocationTargetException e) {
- Logger.getLogger().logError(e);
- IStatus status = J2EEPlugin.newErrorStatus(IStatus.ERROR, DELETE_ERROR, e);
- ErrorDialog.openError(shell, DELETE_ERROR, DELETE_NOT_COMPLETED, status);
- }
-
- /**
- * Update the action's enable state according to the current selection of the used selection
- * provider.
- */
- public void update() {
- IStructuredSelection selection = null;
-
- if (provider != null) {
- selection = (IStructuredSelection) provider.getSelection();
- selectionChanged((ISelection) selection);
- } else {
- selection = (IStructuredSelection) getSelection();
-
- if (selection == null) {
- setEnabled(false);
- } else {
- updateSelection(selection);
- }
- }
- }
-
- protected boolean isJ2EEApplicationProject(Object o) {
- if (o instanceof IProject) {
- IProject project = (IProject) o;
- if (J2EEProjectUtilities.isEARProject(project))
- return true;
- }
- return false;
- }
-
- protected void setEnabledFromSelection(IStructuredSelection selection) {
- if (selection == null) {
- setEnabled(false);
- } else {
- setEnabled(getEnableStateBasedOnSelection(selection));
- }
- }
-
- /**
- * @see SelectionDispatchAction#selectionChanged(ISelection)
- */
- public void selectionChanged(ISelection selection) {
- if (selection instanceof IStructuredSelection)
- setEnabledFromSelection((IStructuredSelection) selection);
- else
- super.selectionChanged(selection);
- }
-
- protected boolean validateState() {
- // TODO Fix validateState
- // if (!primShouldDeleteMetaData())
- // return true;
- //
- // IValidateEditListener listener = new ValidateEditListener(null,
- // getDeleteModuleOperation().getDeleteEditModel());
- // listener.setShell(shell);
- // return listener.validateState().isOK();
- return true;
- }
-
- protected void presentStatusIfNeccessary() {
- IStatus status = null;
-// if (deleteModuleOperation != null)
-// status = deleteModuleOperation.getStatus();
-
- if (status == null || status.isOK())
- return;
-
- ErrorDialog.openError(shell, null, null, status, IStatus.ERROR);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java
deleted file mode 100644
index 97d00f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java
+++ /dev/null
@@ -1,47 +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
- *******************************************************************************/
-/*
- * Created on Jun 16, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EEDeleteModuleActionPopulator {//implements WTPOperationDataModelUICreator {
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.extension.ui.WTPOperationDataModelUICreator#createDataModel(java.lang.String,
- * java.lang.String, org.eclipse.jface.viewers.IStructuredSelection,
- * org.eclipse.ui.IWorkbenchSite)
- */
- public IDataModel createDataModel(String extendedOperationId, String operationClass, IStructuredSelection selection, IWorkbenchSite site) {
- //TODO fix up
-// J2EEDeleteAction deleteAction = new J2EEDeleteAction(site, (ISelectionProvider) null);
-// WTPOperationDataModel dataModel = IActionWTPOperationDataModel.createDataModel(deleteAction, selection, site.getSelectionProvider(), site.getShell());
-// return dataModel;
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java
deleted file mode 100644
index e710407..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java
+++ /dev/null
@@ -1,134 +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
- *******************************************************************************/
-/*
- * Created on Mar 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.deploy.DeployerRegistry;
-import org.eclipse.jst.j2ee.internal.deploy.J2EEDeployOperation;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEDeployAction extends BaseAction {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.ui.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- protected void primRun(Shell shell) {
-
- if (isEnabled()) {
- final IStructuredSelection deploySelection = selection;
- Job deployJob = new Job("Deploy") {
- protected IStatus run(IProgressMonitor monitor) {
- IStatus result = null;
- J2EEDeployOperation op = new J2EEDeployOperation(deploySelection.toArray());
- try {
- result = op.execute(monitor, null);
- } catch (Exception e) {
- result = new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, IStatus.ERROR, WTPResourceHandler.getString("27"), e); //$NON-NLS-1$
- Logger.getLogger().logError(e);
- } finally {
-
- }
- return result;
- }
- };
-
-
- try {
- deployJob.setUser(true);
- deployJob.schedule();
- } catch (Exception e) {
- //Ignore
- }
-
- }
-
- }
-
- /*
- *
- */
- public J2EEDeployAction() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection aSelection) {
- // TODO Auto-generated method stub
- super.selectionChanged(action, aSelection);
- action.setEnabled(isEnabled());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#isEnabled()
- */
- public boolean isEnabled() {
-
- try {
- DeployerRegistry reg = DeployerRegistry.instance();
-
- List modules = DeployerRegistry.getSelectedModules(selection.toArray());
- for (int i = 0; i < modules.size(); i++) {
- EObject module = (EObject) modules.get(i);
- IProject proj = ProjectUtilities.getProject(module);
- IRuntime runtime = J2EEProjectUtilities.getServerRuntime(proj);
- if (proj == null || runtime == null)
- return false;
- List visitors = reg.getDeployModuleExtensions(module, runtime);
- if (!visitors.isEmpty())
- return true;
- }
- return false;
- } catch (CoreException e) {
- System.out.println("Deploy Action recovering from problem verifying enablement."); //$NON-NLS-1$
- e.printStackTrace();
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEModuleRenameChange.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEModuleRenameChange.java
deleted file mode 100644
index da682a4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEModuleRenameChange.java
+++ /dev/null
@@ -1,150 +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
- *******************************************************************************/
-/*
- * Created on Sep 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import java.util.Collections;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameUIConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-
-/**
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EEModuleRenameChange extends Change {
-
- private String newName;
- private IProject target;
- private boolean renameDependencies;
-
- public J2EEModuleRenameChange(IProject target, String newName, boolean renameDependencies) {
- this.target = target;
- this.newName = newName;
- this.renameDependencies = renameDependencies;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.Change#getName()
- */
- public String getName() {
- return J2EERenameUIConstants.RENAME_MODULES;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.Change#initializeValidationData(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void initializeValidationData(IProgressMonitor pm) {
- //Do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.Change#isValid(org.eclipse.core.runtime.IProgressMonitor)
- */
- public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException, OperationCanceledException {
- if (target != null)
- return RefactoringStatus.create(Status.OK_STATUS);
- return RefactoringStatus.create(new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID, 0, "", null)); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.Change#perform(org.eclipse.core.runtime.IProgressMonitor)
- */
- public Change perform(IProgressMonitor pm) throws CoreException {
-// try {
-
-// RenameModuleOperation renameOp = new RenameModuleOperation(getRenameOptions());
-// renameOp.run(pm);
-
- //String contextRoot = getServerContextRoot();
- // TODO fix up rename and context root operations
- //if (webNature != null) {
- //new UpdateWebContextRootMetadataOperation(newTarget, webNature.getContextRoot()).run(pm);
-// if(contextRoot.equals("") == false){ //$NON-NLS-1$
-// new UpdateWebContextRootMetadataOperation(target, contextRoot).run(pm);
-// } else if (J2EENature.getRegisteredRuntime(target) == null)
-// new RenameUtilityJarMetadataOperation(target, newTarget).run(pm);
-// } catch (InvocationTargetException e) {
-// //Ignore
-// } catch (InterruptedException e) {
-// //Ignore
-// }
- return null;
- }
-
- protected String getServerContextRoot() {
- WebArtifactEdit webEdit = null;
- try{
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(target);
- if (webEdit != null)
- return webEdit.getServerContextRoot();
- } finally {
- if (webEdit != null )
- webEdit.dispose();
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * @return
- */
- /**@deprecated
- * If this method is not used it should be removed at a later time, marking as deprecated
- * Warning cleanup 12/07/2005
- */
- private RenameOptions getRenameOptions() {
- RenameOptions options = new RenameOptions();
- options.setNewName(this.newName);
- options.setSelectedProjects(Collections.singletonList(this.target));
- // TODO check module type for EAR type
- //options.setIsEARRename(EARNatureRuntime.getRuntime(this.target) != null);
- options.setRenameModuleDependencies(this.renameDependencies);
- options.setRenameModules(true);
- options.setRenameProjects(false);
- return options;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.Change#getModifiedElement()
- */
- public Object getModifiedElement() {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java
deleted file mode 100644
index b5f6df4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java
+++ /dev/null
@@ -1,393 +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.jst.j2ee.internal.actions;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameUIConstants;
-import org.eclipse.jst.j2ee.internal.dialogs.RenameModuleDialog;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.RenameResourceAction;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-
-public class J2EERenameAction extends SelectionDispatchAction implements J2EERenameUIConstants {
-
- protected Shell shell;
- //Used for EAR rename
- protected Set referencedProjects;
- protected List modules;
- protected RenameOptions options;
- // added for IRefactoringAction behavior
- protected ISelectionProvider provider = null;
-// protected RenameModuleOperation renameModuleOperation = null;
-
- /**
- * Constructor for RenameModuleAction.
- *
- * @param text
- */
- public J2EERenameAction(IWorkbenchSite site, Shell parent) {
- super(site);
- setText(RENAME);
- shell = parent;
- }
-
- public J2EERenameAction(IWorkbenchSite site, ISelectionProvider newProvider) {
- super(site);
- setText(RENAME);
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- provider = newProvider;
- }
-
- protected void reset() {
-// if (renameModuleOperation != null) {
-// renameModuleOperation.release();
-// renameModuleOperation = null;
-// }
- referencedProjects = null;
- modules = null;
- options = null;
- }
-
- /**
- * @see SelectionListenerAction#updateSelection(IStructuredSelection)
- */
- protected void updateSelection(IStructuredSelection selection) {
- super.update(selection);
- }
-
- /**
- * @see SelectionDispatchAction#selectionChanged(ISelection)
- */
- public void selectionChanged(ISelection selection) {
- if (selection instanceof IStructuredSelection)
- setEnabledFromSelection((IStructuredSelection) selection);
- else
- super.selectionChanged(selection);
- }
-
- protected void setEnabledFromSelection(IStructuredSelection selection) {
- if (selection == null) {
- setEnabled(false);
- } else {
- if (selection.toList().size() != 1) {
- setEnabled(false);
- } else {
- setEnabled(getEnableStateBasedOnSelection(selection));
- }
- }
- }
-
- protected boolean getEnableStateBasedOnSelection(IStructuredSelection selection) {
- if (selection.isEmpty())
- return false;
- return isSelectionAllDDRoots() || isSelectionAllApplications();
- }
-
- protected boolean isSelectionAllDDRoots() {
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- //TODO check for j2ee workbench module selection
- if (!CommonUtil.isDeploymentDescriptorRoot(o, false) /*&& !isJ2EEProject(o)*/)
- return false;
- }
- return true;
- }
-
- protected boolean isSelectionAllApplications() {
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- if (!(o instanceof Application) && !isJ2EEApplicationProject(o))
- return false;
- }
- return true;
- }
-
-
- protected List getModules() {
- if (modules == null) {
- modules = new ArrayList();
- IStructuredSelection sel = (StructuredSelection) getSelection();
- Iterator iterator = sel.iterator();
- WorkbenchComponent module = null;
- Object o = null;
- while (iterator.hasNext()) {
- o = iterator.next();
- if (o instanceof WorkbenchComponent) {
- modules.add(o);
- } else if (o instanceof EObject) {
- EObject obj = (EObject) o;
- IProject project = ProjectUtilities.getProject(obj);
- StructureEdit moduleCore = null;
- try {
- moduleCore = StructureEdit.getStructureEditForRead(project);
- URI uri = obj.eResource().getURI();
- ComponentResource[] resources = moduleCore.findResourcesBySourcePath(uri);
- for (int i=0; i<resources.length; i++) {
- module = resources[i].getComponent();
- if (module !=null)
- break;
- }
- if (module == null)
- throw new RuntimeException(J2EEUIMessages.getResourceString("Project_should_not_be_null_1_ERROR_")); //$NON-NLS-1$
- modules.add(module);
- } catch (UnresolveableURIException e) {
- //Ignore
- } finally {
- if (moduleCore !=null)
- moduleCore.dispose();
- }
- } else {
- throw new RuntimeException(J2EEUIMessages.getResourceString("Non-project_in_selection_2_ERROR_")); //$NON-NLS-1$
- }
- }
- }
- return modules;
- }
-
- /**
- * @see IAction#run()
- */
- public void run() {
- try {
- List localModules = getModules();
- if (localModules.size() != 1)
- return;
- WorkbenchComponent module = (WorkbenchComponent) localModules.get(0);
- J2EERenameDialog dlg = null;
-
- // if all we are doing is renaming an EAR, let the base platform do it
- if (isSelectionAllApplications()) {
- RenameResourceAction action = new RenameResourceAction(shell);
- action.selectionChanged(new StructuredSelection(module));
- action.run();
- } else {
- String contextRoot = ""; //$NON-NLS-1$
- //TODO add context root to the module model
- //contextRoot = module.getServerContextRoot();
- dlg = new RenameModuleDialog(shell, module.getName(), contextRoot);
- dlg.open();
- if (dlg.getReturnCode() == Window.CANCEL)
- return;
-
- options = dlg.getRenameOptions();
- if (options != null)
- options.setSelectedProjects(localModules);
-
- if (!(ensureEditorsSaved() && validateState()))
- return;
- renameProjectsIfNecessary();
- renameMetadataIfNecessary();
- presentStatusIfNeccessary();
- }
- } finally {
- reset();
- }
- }
-
-
- private boolean ensureEditorsSaved() {
- return CommonEditorUtility.promptToSaveAllDirtyEditors();
- }
-
- protected Set getReferencedProjects() {
- if (referencedProjects == null)
- computeReferencedProjects();
- return referencedProjects;
- }
-
- protected void computeReferencedProjects() {
- getModules();
- referencedProjects = new HashSet();
- for (int i = 0; i < modules.size(); i++) {
- //WorkbenchComponent module = (WorkbenchComponent) modules.get(i);
- //TODO fix up code here for modules instead of projects
-// EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
-// if (runtime == null)
-// continue;
-// EAREditModel editModel = runtime.getEarEditModelForRead(this);
-// try {
-// referencedProjects.addAll(editModel.getModuleMappedProjects());
-// } finally {
-// editModel.releaseAccess(this);
-// }
- }
- }
-
- protected void renameMetadataIfNecessary() {
- if (!shouldRenameMetaData())
- return;
-// RenameModuleOperation op = getRenameModuleOperation();
-// IRunnableWithProgress runnable = WTPUIPlugin.getRunnableWithProgress(op);
-// ProgressMonitorDialog monitorDialog = new ProgressMonitorDialog(shell);
-//
-// try {
-// monitorDialog.run(false, false, runnable);
-// } catch (InvocationTargetException e) {
-// handleException(e);
-// } catch (InterruptedException e) {
-// //Ignore
-// }
- }
-
- protected boolean shouldRenameMetaData() {
- if (renameProjectsFailedOrCancelled())
- return false;
-
- return primShouldRenameMetaData();
- }
-
- protected boolean renameProjectsFailedOrCancelled() {
- if (options == null || !options.shouldRenameProjects())
- return false;
- return renamedProjectsExist();
- }
-
- protected boolean renamedProjectsExist() {
- List renamedProjects = options.getAllProjectsToRename();
- for (int i = 0; i < renamedProjects.size(); i++) {
- IProject project = (IProject) renamedProjects.get(i);
- if (project.exists())
- return true;
- }
- return false;
- }
-
- protected void renameProjectsIfNecessary() {
- if (options == null || !options.shouldRenameProjects())
- return;
- J2EERenameResourceAction action = new J2EERenameResourceAction(shell);
- action.setNewName(options.getNewName());
- IStructuredSelection sel = new StructuredSelection(options.getAllProjectsToRename());
- action.selectionChanged(sel);
- action.run();
-
- // only web projects should have a context root
- String newContextRoot = options.getNewContextRoot();
- if (newContextRoot != null && options.shouldRenameProjects()) {
- //WorkbenchComponent module = (WorkbenchComponent) getModules().get(0);
- try {
- // TODO add server context root to the module model
- //module.setServerContextRoot(newContextRoot);
- } catch (Throwable t) {
- //Ignore
- }
- }
- }
-
- public void handleException(InvocationTargetException e) {
- Logger.getLogger().logError(e);
- IStatus status = J2EEPlugin.newErrorStatus(IStatus.ERROR, RENAME_ERROR, e);
- ErrorDialog.openError(shell, RENAME_ERROR, RENAME_NOT_COMPLETED, status);
- }
-
- /**
- * Update the action's enable state according to the current selection of the used selection
- * provider.
- */
- public void update() {
- IStructuredSelection selection = null;
-
- if (provider != null) {
- selection = (IStructuredSelection) provider.getSelection();
- super.update(selection);
- } else {
- selection = (IStructuredSelection) getSelection();
-
- if (selection == null) {
- setEnabled(false);
- } else {
- updateSelection(selection);
- }
- }
- }
-
- protected boolean isJ2EEApplicationProject(Object o) {
- if (o instanceof IProject) {
- IProject project = (IProject) o;
- if (J2EEProjectUtilities.isEARProject(project))
- return true;
- }
- return false;
- }
-
- protected boolean validateState() {
- if (!primShouldRenameMetaData())
- return true;
-
-// IValidateEditListener listener = new ValidateEditListener(null, getRenameModuleOperation().getRenameEditModel());
-// listener.setShell(shell);
-// return listener.validateState().isOK();
- return false;
- }
-
- protected boolean primShouldRenameMetaData() {
- return options != null && (options.shouldRenameModules() || options.shouldRenameModuleDependencies());
- }
-
-// protected RenameModuleOperation getRenameModuleOperation() {
-// if (renameModuleOperation == null) {
-// renameModuleOperation = new RenameModuleOperation(options);
-// }
-// return renameModuleOperation;
-// }
-
- protected void presentStatusIfNeccessary() {
- IStatus status = null;
-
-// if (renameModuleOperation != null) {
-// status = renameModuleOperation.getStatus();
-// }
-
- if (status == null || status.isOK())
- return;
-
- ErrorDialog.openError(shell, null, null, status, IStatus.ERROR);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameParticipant.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameParticipant.java
deleted file mode 100644
index e52b7c6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameParticipant.java
+++ /dev/null
@@ -1,95 +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
- *******************************************************************************/
-/*
- * Created on Sep 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameUIConstants;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-
-
-/**
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EERenameParticipant extends RenameParticipant {
-
- private static final Class IPROJECT_CLASS = IProject.class;
-
- public J2EERenameParticipant() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
- */
- protected boolean initialize(Object element) {
- if (element == null)
- return false;
-
- IProject project = (IProject) AdaptabilityUtility.getAdapter(element, IPROJECT_CLASS);
- if (project.isAccessible()) {
- return true;
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
- */
- public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
- Object[] targetElements = getProcessor().getElements();
- if (targetElements == null || targetElements.length != 1)
- return null;
- IProject project = (IProject) AdaptabilityUtility.getAdapter(targetElements[0], IPROJECT_CLASS);
-
- if (project != null)
- return new J2EEModuleRenameChange(project, getArguments().getNewName(), getArguments().getUpdateReferences());
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
- */
- public String getName() {
- return J2EERenameUIConstants.RENAME;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
- * org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
- */
- public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException {
- return RefactoringStatus.create(Status.OK_STATUS);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameResourceAction.java
deleted file mode 100644
index f927e1c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameResourceAction.java
+++ /dev/null
@@ -1,67 +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.jst.j2ee.internal.actions;
-
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.RenameResourceAction;
-
-public class J2EERenameResourceAction extends RenameResourceAction {
- String newName = null;
-
- /**
- * Creates a new action. Using this constructor directly will rename using a dialog (if
- * necessary) rather than the inline editor of a ResourceNavigator. Note that a rename happens
- * on one and only one resource at a time.
- *
- * @param shell
- * the shell for any dialogs
- */
- public J2EERenameResourceAction(Shell shell) {
- super(shell);
- }
-
- /**
- * Return the new name to be given to the target resource.
- *
- * @return java.lang.String
- */
- protected String queryNewResourceName(final IResource resource) {
- String retVal = null;
-
- if (newName == null || newName.length() < 1) {
- retVal = super.queryNewResourceName(resource);
- } else {
- retVal = newName;
- }
-
- return retVal;
- }
-
- /**
- * Gets the newName.
- *
- * @return Returns a String
- */
- public String getNewName() {
- return newName;
- }
-
- /**
- * Sets the newName.
- *
- * @param newName
- * The newName to set
- */
- public void setNewName(String newName) {
- this.newName = newName;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEResourceOpenListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEResourceOpenListener.java
deleted file mode 100644
index 2d0657e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEResourceOpenListener.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 2, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.OpenEvent;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEResourceOpenListener implements IOpenListener{
-
- private OpenJ2EEResourceAction action;
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IOpenListener#open(org.eclipse.jface.viewers.OpenEvent)
- */
-
- public void open(OpenEvent anEvent) {
- ISelection selection = anEvent.getSelection();
- if (selection instanceof IStructuredSelection) {
-
- if (getAction().updateSelection((IStructuredSelection)selection))
- action.run();
- }
-
- }
-
- /**
- * @return
- */
- private OpenJ2EEResourceAction getAction() {
- if (action == null)
- action = new OpenJ2EEResourceAction();
- return action;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewAppClientComponentAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewAppClientComponentAction.java
deleted file mode 100644
index b8a2f7e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewAppClientComponentAction.java
+++ /dev/null
@@ -1,48 +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.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-public class NewAppClientComponentAction extends AbstractOpenWizardWorkbenchAction {
-
- // TODO MDE 02-28 Find correct label
- public static String LABEL = J2EEUIMessages.getResourceString("NewApplClientModuleAction_UI_0"); //$NON-NLS-1$
- private static final String ICON = "new_appclientproject_wiz"; //$NON-NLS-1$
-
- public NewAppClientComponentAction() {
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewAppClientComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
- super(workbench, label, acceptedTypes, false);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- protected Wizard createWizard() {
- return new AppClientProjectWizard();
- }
-
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }
-
- protected String getDialogText() {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewEARComponentAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewEARComponentAction.java
deleted file mode 100644
index 3c96cb2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewEARComponentAction.java
+++ /dev/null
@@ -1,48 +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.jst.j2ee.internal.actions;
-
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-public class NewEARComponentAction extends AbstractOpenWizardWorkbenchAction {
- // TODO MDE 02-28 Find correct label
- public static String LABEL = J2EEUIMessages.getResourceString("NewEARModuleAction_UI_0"); //$NON-NLS-1$
- private static final String ICON = "newear_wiz"; //$NON-NLS-1$
-
- public NewEARComponentAction() {
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewEARComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
- super(workbench, label, acceptedTypes, false);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- protected Wizard createWizard() {
- return new EarProjectWizard();
- }
-
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }
-
- protected String getDialogText() {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
deleted file mode 100644
index e6f9ad9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
+++ /dev/null
@@ -1,231 +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.jst.j2ee.internal.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * Action for opening a J2EE resource from the J2EE navigator.
- */
-public class OpenJ2EEResourceAction extends AbstractOpenAction {
-
- public static final String ID = "org.eclipse.jst.j2ee.internal.internal.ui.actions.OpenJ2EEResourceAction"; //$NON-NLS-1$
- public static final String JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.java.EnterpriseBeanJavaEditor"; //$NON-NLS-1$
- public static final String BASE_JAVA_EDITOR_ID = "org.eclipse.jdt.ui.CompilationUnitEditor"; //$NON-NLS-1$
-
- protected static IEditorDescriptor javaEditorDescriptor;
- protected static IEditorDescriptor baseJavaEditorDescriptor;
-
- /**
- * Create an instance of this class
- */
- public OpenJ2EEResourceAction() {
- super(""); //$NON-NLS-1$
- }
-
- /**
- * Returns the action ID.
- */
- public String getID() {
- return ID;
- }
-
- public static IEditorDescriptor getJavaEditorDescriptor() {
- if (javaEditorDescriptor == null)
- javaEditorDescriptor = findEditorDescriptor(JAVA_EDITOR_ID);
- return javaEditorDescriptor;
- }
-
- public static IEditorDescriptor getBaseJavaEditorDescriptor() {
- if (baseJavaEditorDescriptor == null)
- baseJavaEditorDescriptor = findEditorDescriptor(BASE_JAVA_EDITOR_ID);
- return baseJavaEditorDescriptor;
- }
-
- /**
- * open the appropriate editor
- */
- protected void openAppropriateEditor(IResource r) {
- if (r == null)
- return;
- IWorkbenchPage page = null;
- IEditorPart editor = null;
- try {
- page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- editor = page.openEditor(new FileEditorInput((IFile) r), currentDescriptor.getId());
- if (editor instanceof ISetSelectionTarget)
- ((ISetSelectionTarget) editor).selectReveal(getStructuredSelection());
- } catch (Exception e) {
- MessageDialog.openError(page.getWorkbenchWindow().getShell(), J2EEUIMessages.getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- /**
- * The user has invoked this action
- */
- public void run() {
- if (!isEnabled())
- return;
-
- if (srcObject instanceof J2EEJavaClassProviderHelper) {
- ((J2EEJavaClassProviderHelper) srcObject).openInEditor();
- return;
- }
- if (srcObject instanceof EObject) {
- EObject ro = (EObject) srcObject;
- IProject p = ProjectUtilities.getProject(ro);
- if (ro instanceof BeanLink) {
- openBeanLinkInJavaEditor((BeanLink) ro, p);
- return;
- }
- openAppropriateEditor(WorkbenchResourceHelper.getFile((EObject)srcObject));
- }
- else if (srcObject instanceof Resource)
- openAppropriateEditor(WorkbenchResourceHelper.getFile((Resource)srcObject));
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should override this method
- * to react to the change. Returns true if the action should be enabled for this selection, and
- * false otherwise.
- *
- * When this method is overridden, the super method must always be invoked. If the super method
- * returns false, this method must also return false.
- *
- * @param sel the new structured selection
- */
- public boolean updateSelection(IStructuredSelection s) {
- if (!super.updateSelection(s))
- return false;
-
- // Make sure this is one of the selections we can handle,
- // then set the source object as is. The run() will do the hard stuff.
- Object obj = s.getFirstElement();
-
- if (obj instanceof J2EEJavaClassProviderHelper)
- currentDescriptor = getJavaEditorDescriptor();
- else if (obj instanceof BeanLink)
- currentDescriptor = getBaseJavaEditorDescriptor();
- else if (obj instanceof EObject) {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((EObject)obj);
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(), contentType);
- }
- else if (obj instanceof Resource) {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((Resource)obj);
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(), contentType);
- }
- else {
- currentDescriptor = null;
- return false;
- }
- setAttributesFromDescriptor();
- srcObject = obj;
- return true;
- }
-
- /**
- * @param link
- */
- private void openBeanLinkInJavaEditor(BeanLink link, IProject p) {
- String linkName = null;
- JavaClass javaClass = null;
- IVirtualComponent comp = ComponentUtilities.findComponent(link);
- // Handle EJB Link case
- if (link instanceof EJBLink) {
- linkName = ((EJBLink) link).getEjbLink();
- EJBArtifactEdit artifactEdit = null;
- try {
- artifactEdit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
- EJBJar ejbJar = artifactEdit.getEJBJar();
- if (ejbJar == null)
- return;
- EnterpriseBean bean = ejbJar.getEnterpriseBeanNamed(linkName);
- if (bean == null)
- return;
- javaClass = bean.getEjbClass();
- } finally {
- if (artifactEdit!=null)
- artifactEdit.dispose();
- }
- }
- // Handle Servlet Link case
- else {
- linkName = ((ServletLink) link).getServletLink();
- WebArtifactEdit artifactEdit = null;
- try {
- artifactEdit = WebArtifactEdit.getWebArtifactEditForRead(comp);
- WebApp webApp = artifactEdit.getWebApp();
- if (webApp == null)
- return;
- Servlet servlet = webApp.getServletNamed(linkName);
- if (servlet == null)
- return;
- javaClass = servlet.getServletClass();
- } finally {
- if (artifactEdit!=null)
- artifactEdit.dispose();
- }
- }
- // Open java editor on the selected objects associated java file
- try {
- J2EEEditorUtility.openInEditor(javaClass, p);
- } catch (Exception cantOpen) {
- cantOpen.printStackTrace();
- }
- }
-
- protected EObject getRootObject(Object obj) {
- if (obj instanceof EObject) {
- EObject refObj = (EObject) obj;
- while (refObj != null && refObj.eContainer() != null)
- refObj = refObj.eContainer();
- return refObj;
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WTPBaseAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WTPBaseAction.java
deleted file mode 100644
index 5433410..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WTPBaseAction.java
+++ /dev/null
@@ -1,122 +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
- *******************************************************************************/
-/*
- * Created on Jul 7, 2004
- *
- * TODO To change the template for this generated file go to Window - Preferences - Java - Code
- * Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-
-public abstract class WTPBaseAction extends Action implements IActionDelegate2 {
- private final static String ERROR_OCCURRED_TITLE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_TITLE"); //$NON-NLS-1$
- private final static String ERROR_OCCURRED_MESSAGE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_MESSAGE"); //$NON-NLS-1$
-
- protected IStructuredSelection selection = null;
-
- protected IWorkbenchWindow getWorkbenchWindow() {
- return J2EEUIPlugin.getPluginWorkbench().getActiveWorkbenchWindow();
- }
-
- public void setSelection(IStructuredSelection selection) {
- this.selection = selection;
- }
-
- public void run() {
- Shell shell = getWorkbenchWindow().getShell();
- if (null == selection) {
- ISelection autoselection = getWorkbenchWindow().getSelectionService().getSelection();
- if (autoselection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection) autoselection;
- }
-
- try {
- primRun(shell);
- this.selection = null;
- } catch (Throwable t) {
- ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
- }
-
- }
-
- protected abstract void primRun(Shell shell);
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- //dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- //init
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection aSelection) {
- setSelection((IStructuredSelection) aSelection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- run();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- run();
- }
-
- /**
- * @return Returns the selection.
- */
- protected IStructuredSelection getSelection() {
- return selection;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index 021b931..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,82 +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.jst.j2ee.internal.actions;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * An operation which delegates its work to a runnable that modifies the workspace.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.ui.actions.WorkspaceModifyOperation {
- protected List fRunnables;
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
- super(rule);
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- */
- public WorkspaceModifyComposedOperation() {
- super();
- }
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
- super(rule);
- fRunnables = nestedRunnablesWithProgress;
- }
-
- public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
- super();
- fRunnables = nestedRunnablesWithProgress;
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- *
- * @param content
- * the runnable to delegate to when this operation is executed
- */
- public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
- super();
- getRunnables().add(nestedOp);
- }
-
- public boolean addRunnable(IRunnableWithProgress nestedOp) {
- return getRunnables().add(nestedOp);
- }
-
- protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- int size = fRunnables.size();
- monitor.beginTask("", size);//$NON-NLS-1$
- for (int i = 0; i < fRunnables.size(); i++) {
- IRunnableWithProgress op = (IRunnableWithProgress) fRunnables.get(i);
- op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
- }
- }
-
- protected List getRunnables() {
- if (fRunnables == null)
- fRunnables = new ArrayList(3);
- return fRunnables;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java
deleted file mode 100644
index f610fcf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java
+++ /dev/null
@@ -1,59 +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.jst.j2ee.internal.client.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AppClientArchiveUIResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("appclientarchiveui");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java
deleted file mode 100644
index 296fd55..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java
+++ /dev/null
@@ -1,51 +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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.client.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportApplicationClientAction extends BaseAction {
- public static String LABEL = J2EEUIPlugin.getDefault().getDescriptor().getResourceString("%client.export.action.label_ui_"); //$NON-NLS-1$
- private static final String ICON = "appclient_export_wiz"; //$NON-NLS-1$
-
- public ExportApplicationClientAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- protected void primRun(Shell shell) {
- AppClientComponentExportWizard wizard = new AppClientComponentExportWizard();
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
- wizard.init(plugin.getWorkbench(), selection);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java
deleted file mode 100644
index eec6155..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java
+++ /dev/null
@@ -1,56 +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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.client.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportApplicationClientAction extends BaseAction {
-
- public static String LABEL = AppClientArchiveUIResourceHandler.getString("Application_Client_Import_UI_"); //$NON-NLS-1$
- private static final String ICON = "appclient_import_wiz"; //$NON-NLS-1$
-
- public ImportApplicationClientAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- protected void primRun(Shell shell) {
-
- AppClientComponentImportWizard wizard = new AppClientComponentImportWizard();
-
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
- wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java
deleted file mode 100644
index 42564f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java
+++ /dev/null
@@ -1,97 +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.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.edit.command.AbstractOverrideableCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-/**
- * Insert the type's description here. Creation date: (06/07/01 10:56:08 AM)
- *
- * @author: Administrator
- */
-public abstract class AbstractOverrideCommand extends AbstractCommand {
- private AbstractOverrideableCommand overridable;
- private J2EEClipboard j2eeClipboard;
-
- /**
- * AbstractOverrideCommand constructor comment.
- */
- protected AbstractOverrideCommand() {
- super();
- }
-
- public AbstractOverrideCommand(AbstractOverrideableCommand command) {
- super(command.getLabel(), command.getDescription());
- setOverridable(command);
- }
-
- public boolean canExecute() {
- return super.canExecute() && overridable.doCanExecute();
- }
-
- public boolean canUndo() {
- return overridable.doCanUndo();
- }
-
- public Collection getAffectedObjects() {
- return overridable.doGetAffectedObjects();
- }
-
- public EditingDomain getDomain() {
- return getOverridable().getDomain();
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 11:19:27 AM)
- *
- * @return org.eclipse.jst.j2ee.internal.internal.internal.command.J2EEClipboard
- */
- public J2EEClipboard getJ2eeClipboard() {
- return j2eeClipboard;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 10:58:33 AM)
- *
- * @return AbstractOverrideableCommand
- */
- public AbstractOverrideableCommand getOverridable() {
- return overridable;
- }
-
- public Collection getResult() {
- return getJ2eeClipboard();
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 11:19:27 AM)
- *
- * @param newJ2eeClipboard
- * org.eclipse.jst.j2ee.internal.internal.internal.command.J2EEClipboard
- */
- protected void setJ2eeClipboard(J2EEClipboard newJ2eeClipboard) {
- j2eeClipboard = newJ2eeClipboard;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 10:58:33 AM)
- *
- * @param AbstractOverrideableCommand
- */
- protected void setOverridable(AbstractOverrideableCommand newOverridable) {
- overridable = newOverridable;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java
deleted file mode 100644
index ea1fcca..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.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.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-
-public class J2EEClipboard extends ArrayList {
- /**
- * Warning cleanup 12/07/2005
- */
- private static final long serialVersionUID = 8713021573099134096L;
- private Map bindings;
- private Map extensions;
-
- /**
- * J2EEClipboard constructor comment.
- */
- public J2EEClipboard(Collection defaultClipboard) {
- super(defaultClipboard);
- }
-
- public boolean addAll(Collection c) {
- boolean result = super.addAll(c);
- if (result && (c instanceof J2EEClipboard))
- addAllExtra((J2EEClipboard) c);
- return result;
- }
-
- protected void addAllExtra(J2EEClipboard c) {
- getBindings().putAll(c.getBindings());
- getExtensions().putAll(c.getExtensions());
- }
-
- protected void addBinding(EObject boundObject, EObject binding) {
- getBindings().put(boundObject, binding);
- }
-
- protected void addExtension(EObject extendedObject, EObject extension) {
- getExtensions().put(extendedObject, extension);
- }
-
- public EObject getBinding(EObject o) {
- return (EObject) getBindings().get(o);
- }
-
- protected Map getBindings() {
- if (bindings == null)
- bindings = new HashMap(10);
- return bindings;
- }
-
- public EObject getExtension(EObject o) {
- return (EObject) getExtensions().get(o);
- }
-
- protected Map getExtensions() {
- if (extensions == null)
- extensions = new HashMap(10);
- return extensions;
- }
-
- public boolean hasBindings() {
- return bindings != null && !bindings.isEmpty();
- }
-
- public boolean hasExtensions() {
- return extensions != null && !extensions.isEmpty();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java
deleted file mode 100644
index bf103ab..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java
+++ /dev/null
@@ -1,191 +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.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-
-/**
- * Insert the type's description here. Creation date: (06/13/01 10:27:16 AM)
- *
- * @author: Administrator
- */
-public class J2EECompoundCommand extends CompoundCommand {
- /**
- * J2EECompoundCommand constructor comment.
- */
- public J2EECompoundCommand() {
- super();
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- */
- public J2EECompoundCommand(int resultIndex) {
- super(resultIndex);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- */
- public J2EECompoundCommand(int resultIndex, String label) {
- super(resultIndex, label);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- */
- public J2EECompoundCommand(int resultIndex, String label, String description) {
- super(resultIndex, label, description);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(int resultIndex, String label, String description, java.util.List commandList) {
- super(resultIndex, label, description, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(int resultIndex, String label, java.util.List commandList) {
- super(resultIndex, label, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(int resultIndex, java.util.List commandList) {
- super(resultIndex, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- */
- public J2EECompoundCommand(String label) {
- super(label);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- */
- public J2EECompoundCommand(String label, String description) {
- super(label, description);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(String label, String description, java.util.List commandList) {
- super(label, description, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(String label, java.util.List commandList) {
- super(label, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(java.util.List commandList) {
- super(commandList);
- }
-
- protected Collection getMergedAffectedObjectsCollection() {
- J2EEClipboard result = new J2EEClipboard(new ArrayList());
-
- for (Iterator commands = commandList.iterator(); commands.hasNext();) {
- Command command = (Command) commands.next();
- result.addAll(command.getAffectedObjects());
- }
-
- return result;
- }
-
- protected Collection getMergedResultCollection() {
- J2EEClipboard result = new J2EEClipboard(new ArrayList());
-
- for (Iterator commands = commandList.iterator(); commands.hasNext();) {
- Command command = (Command) commands.next();
- result.addAll(command.getResult());
- }
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java
deleted file mode 100644
index 51dc0bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java
+++ /dev/null
@@ -1,81 +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.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.CopyGroup;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-public class J2EECopyCommand extends AbstractCommand {
- protected EObject objectToCopy;
- protected EObject bindingToCopy;
- protected EObject extensionToCopy;
- protected J2EEClipboard result;
- protected EtoolsCopyUtility copyUtil;
-
- public J2EECopyCommand(EObject object, EObject binding, EObject extension, EtoolsCopyUtility copyUtility) {
- objectToCopy = object;
- bindingToCopy = binding;
- extensionToCopy = extension;
- copyUtil = copyUtility;
- }
-
- /**
- * This will perform the command activity required for the effect. The effect of calling execute
- * when canExecute returns false, or when canExecute hasn't been called, is undefined.
- */
- public void execute() {
- CopyGroup group = new CopyGroup();
-
- group.add(objectToCopy);
-
- if (bindingToCopy != null)
- group.add(bindingToCopy);
- if (extensionToCopy != null)
- group.add(extensionToCopy);
- copyUtil.copy(group);
- EObject copy = copyUtil.getCopy(objectToCopy);
- result = new J2EEClipboard(Collections.singleton(copy));
-
- if (bindingToCopy != null)
- result.addBinding(copy, copyUtil.getCopy(bindingToCopy));
- if (extensionToCopy != null)
- result.addExtension(copy, copyUtil.getCopy(extensionToCopy));
- }
-
- public Collection getAffectedObjects() {
- return result;
- }
-
- public Collection getResult() {
- return result;
- }
-
- protected boolean prepare() {
- return true;
- }
-
- /**
- * This will again perform the command activity required to redo the effect after undoing the
- * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
- * you implement redo to call execute then any derived class will be restricted to by that
- * decision also.
- */
- public void redo() {
- //redo
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java
deleted file mode 100644
index 5581dec..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java
+++ /dev/null
@@ -1,96 +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.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUIEditingDomain;
-import org.eclipse.wst.common.internal.emf.utilities.CopyGroup;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-/**
- * Insert the type's description here. Creation date: (06/11/01 8:45:21 AM)
- *
- * @author: Administrator
- */
-public class J2EECopyFromClipboardCommand extends AbstractCommand {
- private J2EEUIEditingDomain domain;
- private J2EEClipboard result;
- private EtoolsCopyUtility copyUtil;
-
- public J2EECopyFromClipboardCommand(J2EEUIEditingDomain editingDomain) {
- domain = editingDomain;
-
- }
-
- /**
- * This will perform the command activity required for the effect. The effect of calling execute
- * when canExecute returns false, or when canExecute hasn't been called, is undefined.
- */
- public void execute() {
- if (copyUtil != null)
- return;
- copyUtil = new EtoolsCopyUtility();
- J2EEClipboard clipboard = domain.getJ2EEClipboard();
- result = new J2EEClipboard(new ArrayList(0));
- for (int i = 0; i < clipboard.size(); i++) {
- CopyGroup group = new CopyGroup();
- EObject o = (EObject) clipboard.get(i);
- group.add(o);
- EObject bnd = clipboard.getBinding(o);
- if (bnd != null)
- group.add(bnd);
- EObject ext = clipboard.getExtension(o);
- if (ext != null)
- group.add(ext);
- copyUtil.copy(group);
- EObject copy = copyUtil.getCopy(o);
- result.add(copy);
- if (bnd != null)
- result.addBinding(copy, copyUtil.getCopy(bnd));
- if (ext != null)
- result.addExtension(copy, copyUtil.getCopy(ext));
- }
- //Reset the util so redo will actuall redo
- copyUtil = null;
- }
-
- public Collection getAffectedObjects() {
- return result;
- }
-
- public Collection getResult() {
- return result;
- }
-
- protected boolean prepare() {
- return true;
- }
-
- /**
- * This will again perform the command activity required to redo the effect after undoing the
- * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
- * you implement redo to call execute then any derived class will be restricted to by that
- * decision also.
- */
- public void redo() {
- execute();
- }
-
- public void undo() {
- result = null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java
deleted file mode 100644
index eb42b83..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java
+++ /dev/null
@@ -1,84 +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.jst.j2ee.internal.command;
-
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-public class J2EECopyToClipboardOverrideCommand extends CopyToClipboardCommand {
- //The collection of source objects, with bindings and extensions, if any exist
- protected J2EEClipboard extendedSourceObjects;
- protected boolean onlyRefObjects = true;
-
- public J2EECopyToClipboardOverrideCommand(CopyToClipboardCommand cmd) {
- super(cmd.getDomain(), cmd.getSourceObjects());
- }
-
- protected Command createCopyCommand() {
- CompoundCommand cmd = new J2EECompoundCommand(CompoundCommand.MERGE_COMMAND_ALL);
- Iterator it = extendedSourceObjects.iterator();
- EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
- while (it.hasNext()) {
- Object o = it.next();
- if (!(o instanceof EObject)) {
- cmd.append(UnexecutableCommand.INSTANCE);
- } else {
- EObject r = (EObject) o;
- cmd.append(new J2EECopyCommand(r, extendedSourceObjects.getBinding(r), extendedSourceObjects.getExtension(r), copyUtil));
- }
- }
- return cmd.unwrap();
- }
-
- protected boolean prepare() {
- prepareSourceObjects();
- if (!onlyRefObjects) {
- copyCommand = UnexecutableCommand.INSTANCE;
- return copyCommand.canExecute();
- }
-
- if (!extendedSourceObjects.hasBindings() && !extendedSourceObjects.hasExtensions())
- return super.prepare();
-
- copyCommand = createCopyCommand();
- return copyCommand.canExecute();
- }
-
- protected void prepareSourceObjects() {
- extendedSourceObjects = new J2EEClipboard(getSourceObjects());
- Iterator it = getSourceObjects().iterator();
- while (it.hasNext()) {
- Object o = it.next();
- if (o instanceof EObject) {
- // EObject r = (EObject) o;
- // TODO switch to adaptable commands
- // EObject bnd = BindingAndExtensionHelper.getBinding(r);
- // EObject ext = BindingAndExtensionHelper.getExtension(r);
- // if (bnd != null)
- // extendedSourceObjects.addBinding(r, bnd);
- // if (ext != null)
- // extendedSourceObjects.addExtension(r, ext);
- } else {
- //Right now we can only handle ref objects in the tree
- onlyRefObjects = false;
- return;
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java
deleted file mode 100644
index d51a6d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java
+++ /dev/null
@@ -1,150 +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.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
-import org.eclipse.emf.common.command.StrictCompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.jst.j2ee.common.internal.util.IDUtility;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUIEditingDomain;
-
-
-public class J2EEPasteFromClipboardOverrideCommand extends PasteFromClipboardCommand {
- private J2EECopyFromClipboardCommand copyCommand;
- private Command addBindingsCommand;
- private Command addExtensionsCommand;
-
- public J2EEPasteFromClipboardOverrideCommand(PasteFromClipboardCommand p) {
- super(p.getDomain(), p.getOwner(), p.getFeature(), p.getIndex(), false);
- }
-
- public void doExecute() {
- super.doExecute();
- executeAddBindings();
- executeAddExtensions();
- J2EEClipboard result = (J2EEClipboard) doGetResult();
- for (int i = 0; i < result.size(); i++) {
- EObject o = (EObject) result.get(i);
- if (result.getBinding(o) != null || result.getExtension(o) != null)
- IDUtility.setDefaultID(o, true);
- }
- }
-
- public Collection doGetAffectedObjects() {
- return copyCommand.getAffectedObjects();
- }
-
- public Collection doGetResult() {
- return copyCommand.getResult();
- }
-
- public void doRedo() {
- super.doRedo();
- if (addBindingsCommand != null)
- addBindingsCommand.redo();
- if (addExtensionsCommand != null)
- addExtensionsCommand.redo();
- }
-
- public void doUndo() {
- super.doUndo();
- if (addBindingsCommand != null)
- addBindingsCommand.undo();
- if (addExtensionsCommand != null)
- addExtensionsCommand.undo();
- }
-
- protected void executeAddBindings() {
- if (addBindingsCommand != null && addBindingsCommand.canExecute())
- addBindingsCommand.execute();
- }
-
- protected void executeAddExtensions() {
- if (addExtensionsCommand != null && addExtensionsCommand.canExecute())
- addExtensionsCommand.execute();
- }
-
- public J2EEClipboard getCopiedClipoard() {
- return (J2EEClipboard) copyCommand.getResult();
- }
-
- protected J2EEClipboard getJ2EEClipboard() {
- return (J2EEClipboard) domain.getClipboard();
- }
-
- protected boolean prepare() {
- if (getJ2EEClipboard() == null)
- return false;
- command = new StrictCompoundCommand();
-
- copyCommand = new J2EECopyFromClipboardCommand((J2EEUIEditingDomain) domain);
- command.append(copyCommand);
-
- command.append(new CommandWrapper() {
- protected Command createCommand() {
- Command addCommand = AddCommand.create(getDomain(), getOwner(), getFeature(), copyCommand.getResult(), getIndex());
- return addCommand;
- }
- });
- prepareBindingCommand(copyCommand);
- prepareExtensionCommand(copyCommand);
-
- boolean result;
- if (optimize) {
- // This will determine canExecute as efficiently as possible.
- //
- result = optimizedCanExecute();
- } else {
- // This will actually execute the copy command in order to check if the add can execute.
- //
- result = command.canExecute();
- }
-
- return result;
- }
-
- protected void prepareBindingCommand(final J2EECopyFromClipboardCommand cmd) {
- if (!getJ2EEClipboard().hasBindings())
- return;
- //TODO make adaptable command
- // addBindingsCommand = new CommandWrapper() {
- // protected Command createCommand() {
- // Object bindingOwner = BindingAndExtensionHelper.getBindingAddOwner((EObject)getOwner());
- // Collection bindingsCopies = getCopiedClipoard().getBindings().values();
- // Command addCommand = AddCommand.create(getDomain(), bindingOwner, null, bindingsCopies,
- // CommandParameter.NO_INDEX);
- // return addCommand;
- // }
- // };
- }
-
- protected void prepareExtensionCommand(final J2EECopyFromClipboardCommand cmd) {
- if (!getJ2EEClipboard().hasExtensions())
- return;
- // TODO make adaptable command
- // addExtensionsCommand = new CommandWrapper() {
- // protected Command createCommand() {
- // Object extensionOwner =
- // BindingAndExtensionHelper.getExtensionAddOwner((EObject)getOwner());
- // Collection extensionsCopies = getCopiedClipoard().getExtensions().values();
- // Command addCommand = AddCommand.create(getDomain(), extensionOwner, null,
- // extensionsCopies, CommandParameter.NO_INDEX);
- // return addCommand;
- // }
- // };
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java
deleted file mode 100644
index ab61039..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java
+++ /dev/null
@@ -1,170 +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.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.command.RemoveCommand;
-
-/**
- * Insert the type's description here. Creation date: (06/07/01 10:44:02 AM)
- *
- * @author: Administrator
- */
-public class J2EERemoveOverrideCommand extends AbstractOverrideCommand {
- private RemoveCommand bindingsRemoveCommand;
- private RemoveCommand extensionsRemoveCommand;
- private ResourceSet resourceSet;
-
- /**
- * J2EERemoveOverrideCommand constructor comment.
- */
- protected J2EERemoveOverrideCommand() {
- super();
- }
-
- public J2EERemoveOverrideCommand(RemoveCommand command) {
- super(command);
- }
-
- protected RemoveCommand createRemoveCommand(Collection elements) {
- return (RemoveCommand) RemoveCommand.create(getDomain(), elements);
- }
-
- /**
- * This will perform the command activity required for the effect. The effect of calling execute
- * when canExecute returns false, or when canExecute hasn't been called, is undefined.
- */
- public void execute() {
- /*
- * For each object being removed, check if it has a binding, and an extension Make
- * collections of these, make a command parameter for each collection, an instantiate a
- * remove command
- */
-
- Collection objects = getRemoveCommand().getCollection();
- List bindings = new ArrayList(objects.size());
- List extensions = new ArrayList(objects.size());
- Iterator it = objects.iterator();
- while (it.hasNext()) {
- EObject o = (EObject) it.next();
- if (resourceSet == null)
- resourceSet = o.eResource().getResourceSet();
- // TODO make command adaptable
- // EObject binding = BindingAndExtensionHelper.getBinding(o);
- // if (binding != null) {
- // bindings.add(binding);
- // getJ2eeClipboard().addBinding(o, binding);
- // }
- // EObject extension = BindingAndExtensionHelper.getExtension(o);
- // if (extension != null) {
- // extensions.add(extension);
- // getJ2eeClipboard().addExtension(o, extension);
- // }
- }
- if (!bindings.isEmpty())
- setBindingsRemoveCommand(createRemoveCommand(bindings));
-
- if (!extensions.isEmpty())
- setExtensionsRemoveCommand(createRemoveCommand(extensions));
-
- executeAllChildren();
- }
-
- protected void executeAllChildren() {
- executeNested(bindingsRemoveCommand);
- executeNested(extensionsRemoveCommand);
- getOverridable().doExecute();
- }
-
- protected void executeNested(RemoveCommand cmd) {
- if (cmd != null && cmd.doCanExecute()) {
- cmd.doExecute();
- // Collection result = cmd.getResult();
- //TODO
- // BindingAndExtensionHelper.resolveAllProxies(result, resourceSet);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @return RemoveCommand
- */
- protected RemoveCommand getBindingsRemoveCommand() {
- return bindingsRemoveCommand;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @return RemoveCommand
- */
- protected RemoveCommand getExtensionsRemoveCommand() {
- return extensionsRemoveCommand;
- }
-
- public RemoveCommand getRemoveCommand() {
- return (RemoveCommand) getOverridable();
- }
-
- protected boolean prepare() {
- setJ2eeClipboard(new J2EEClipboard(getRemoveCommand().getCollection()));
- return true;
- }
-
- /**
- * This will again perform the command activity required to redo the effect after undoing the
- * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
- * you implement redo to call execute then any derived class will be restricted to by that
- * decision also.
- */
- public void redo() {
- executeAllChildren();
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @param newBindingsRemoveCommand
- * RemoveCommand
- */
- protected void setBindingsRemoveCommand(RemoveCommand newBindingsRemoveCommand) {
- bindingsRemoveCommand = newBindingsRemoveCommand;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @param newExtensionsRemoveCommand
- * RemoveCommand
- */
- protected void setExtensionsRemoveCommand(RemoveCommand newExtensionsRemoveCommand) {
- extensionsRemoveCommand = newExtensionsRemoveCommand;
- }
-
- public void undo() {
- getRemoveCommand().doUndo();
- undoNested(bindingsRemoveCommand);
- undoNested(extensionsRemoveCommand);
- }
-
- protected void undoNested(RemoveCommand cmd) {
- if (cmd != null && cmd.doCanUndo())
- cmd.doUndo();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java
deleted file mode 100644
index e0df82a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java
+++ /dev/null
@@ -1,99 +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.jst.j2ee.internal.command;
-
-import org.eclipse.emf.common.command.StrictCompoundCommand;
-
-
-
-/**
- * Overridden to provide an accessor to the pessimistic field. This is needed for the case of
- * undo/redo paste. We need the nested copy commmand in the paste command to redo itself when the
- * paste command is copied, otherwise we run into sed exception.
- */
-public class J2EEStrictCompoundCommand extends StrictCompoundCommand {
- /**
- * J2EEStrictCompoundCommand constructor comment.
- */
- public J2EEStrictCompoundCommand() {
- super();
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- */
- public J2EEStrictCompoundCommand(String label) {
- super(label);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- */
- public J2EEStrictCompoundCommand(String label, String description) {
- super(label, description);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EEStrictCompoundCommand(String label, String description, java.util.List commandList) {
- super(label, description, commandList);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EEStrictCompoundCommand(String label, java.util.List commandList) {
- super(label, commandList);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param commandList
- * java.util.List
- */
- public J2EEStrictCompoundCommand(java.util.List commandList) {
- super(commandList);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- */
- public J2EEStrictCompoundCommand(boolean pessimistic) {
- super();
- setIsPessismistic(pessimistic);
- }
-
- public void setIsPessismistic(boolean aBool) {
- isPessimistic = aBool;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
deleted file mode 100644
index ea7adc7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jan 18, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EnterpriseDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] {ILaunchable.class };
- }
-
- public IModuleArtifact getModuleArtifact(Object obj) {
- return EnterpriseApplicationDeployableAdapterUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java
deleted file mode 100644
index b3cb39e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-
-/**
- * @author blancett
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EnterpriseModuleArtifact implements IModuleArtifact {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.IModuleArtifact#getModule()
- */
- public IModule getModule() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] { IModuleArtifact.class, ILaunchable.class };
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java
deleted file mode 100644
index 2127745..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-
-
-public class J2EEDeployableAdapterFactory implements IAdapterFactory {
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- IModuleArtifact moduleArtifact = null;
-/* if (adapterType == IModuleArtifact.class ) {
-
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.web.deployables.WebModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.web.deployables.WebModuleArtifact");
- }
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.ejb.internal.deployables.IEJBModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.ejb.internal.deployables.IEJBModuleArtifact");
- }
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.deployables.EnterpriseModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.deployables.EnterpriseModuleArtifact");
- }
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact");
- }
- }*/
- return moduleArtifact;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{IModuleArtifact.class, ILaunchable.class};
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARComposite.java
deleted file mode 100644
index fa02515..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARComposite.java
+++ /dev/null
@@ -1,270 +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.jst.j2ee.internal.dialogs;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-public class DeleteEARComposite extends Composite implements J2EEDeleteUIConstants, Listener, ICheckStateListener {
-
- protected DeleteEARDialog dialog;
- protected Button deleteAppProjectsBtn;
- protected Button deleteRefProjectsBtn;
- protected Composite radioComposite;
- protected Button detailsBtn;
- protected DeleteModuleReferencesComposite moduleRefsComposite;
- protected CheckboxTableViewer projectsList;
- protected boolean listCreated = false;
- protected Map referencedProjects;
- protected WorkbenchLabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
-
- /**
- * Constructor for DeleteEARComposite.
- *
- * @param parent
- * @param style
- */
- public DeleteEARComposite(Composite parent, DeleteEARDialog dialog, int style, Set referencedProjects) {
- super(parent, style);
- this.dialog = dialog;
- initReferencedProjects(referencedProjects);
- addChildren();
- }
-
- /**
- * Answer the referenced projects which the user has chosen to also delete
- */
- public java.util.List getSelectedReferencedProjects() {
- if (deleteAppProjectsBtn.getSelection())
- return Collections.EMPTY_LIST;
- java.util.List result = new ArrayList();
- for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
- Map.Entry element = (Map.Entry) iter.next();
- boolean isSelected = ((Boolean) element.getValue()).booleanValue();
- if (isSelected)
- result.add(element.getKey());
- }
- return result;
- }
-
- /**
- * @see J2EEDeleteDialog#createDeleteOptions()
- */
- public DeleteOptions createDeleteOptions() {
- DeleteOptions opts = new DeleteOptions();
- opts.setIsEARDelete(true);
- opts.setDeleteProjects(true);
- opts.setDeleteModuleDependencies(moduleRefsComposite.shouldDeleteModuleDependencies());
- opts.setDeleteModules(moduleRefsComposite.shouldDeleteModules());
- opts.setSelectedReferencedProjects(getSelectedReferencedProjects());
- return opts;
- }
-
-
-
- protected void initReferencedProjects(Set projects) {
- referencedProjects = new HashMap();
- for (Iterator iter = projects.iterator(); iter.hasNext();) {
- IProject project = (IProject) iter.next();
- referencedProjects.put(project, Boolean.TRUE);
- }
- }
-
- protected void addChildren() {
- setLayout();
- addRadioComposite();
- moduleRefsComposite = new DeleteModuleReferencesComposite(this, SWT.NONE, true);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- data.horizontalIndent = 10;
- moduleRefsComposite.setLayoutData(data);
- //setup defaults
- deleteAppProjectsBtn.setSelection(true);
- deleteAppProjectsBtnSelected();
- }
-
- protected void setLayout() {
- GridLayout lay = new GridLayout();
- lay.numColumns = 1;
- setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- setLayoutData(data);
- }
-
- protected void addRadioComposite() {
- radioComposite = new Composite(this, SWT.NONE);
- GridLayout lay = new GridLayout();
- lay.numColumns = 2;
- radioComposite.setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- radioComposite.setLayoutData(data);
- deleteAppProjectsBtn = new Button(radioComposite, SWT.RADIO);
- deleteAppProjectsBtn.setText(DELETE_EAR_PROJECTS);
- deleteAppProjectsBtn.addListener(SWT.Selection, this);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- deleteAppProjectsBtn.setLayoutData(data);
-
- deleteRefProjectsBtn = new Button(radioComposite, SWT.RADIO);
- deleteRefProjectsBtn.setText(DELETE_REFERENCED_PROJECTS);
- deleteRefProjectsBtn.addListener(SWT.Selection, this);
- deleteRefProjectsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- detailsBtn = new Button(radioComposite, SWT.PUSH);
- detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
- detailsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
- detailsBtn.addListener(SWT.Selection, this);
- detailsBtn.setEnabled(false);
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == deleteAppProjectsBtn)
- deleteAppProjectsBtnSelected();
- else if (event.widget == deleteRefProjectsBtn)
- deleteRefProjectsBtnSelected();
- else if (event.widget == detailsBtn)
- detailsBtnSelected();
- }
-
- protected void deleteAppProjectsBtnSelected() {
- if (deleteAppProjectsBtn.getSelection()) {
- if (listCreated)
- toggleDetailsArea();
- detailsBtn.setEnabled(false);
- moduleRefsComposite.setButtonsEnabled(false);
- }
- }
-
- protected void deleteRefProjectsBtnSelected() {
- if (deleteRefProjectsBtn.getSelection()) {
- detailsBtn.setEnabled(true);
- moduleRefsComposite.setButtonsEnabled(true);
- }
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user pressing the details
- * button.
- */
- protected void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = dialog.getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- if (listCreated) {
- projectsList.getControl().dispose();
- listCreated = false;
- detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- createDropDownList();
- detailsBtn.setText(IDialogConstants.HIDE_DETAILS_LABEL);
- }
-
- Point newSize = dialog.getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
- }
-
- protected void createDropDownList() {
- // create the list
- projectsList = CheckboxTableViewer.newCheckList(radioComposite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- projectsList.setLabelProvider(createLabelProvider());
- projectsList.setSorter(new ViewerSorter() {/*viewersorter*/});
- projectsList.addCheckStateListener(this);
- // fill the list
- populateList();
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- data.heightHint = projectsList.getTable().getItemHeight() * referencedProjects.size();
- data.horizontalSpan = 2;
- data.horizontalIndent = 10;
- projectsList.getTable().setLayoutData(data);
-
- listCreated = true;
- }
-
- protected void populateList() {
- for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
- projectsList.add(entry.getKey());
- boolean checked = ((Boolean) entry.getValue()).booleanValue();
- projectsList.setChecked(entry.getKey(), checked);
- }
- }
-
- protected void detailsBtnSelected() {
- toggleDetailsArea();
- }
-
- /**
- * @see ICheckStateListener#checkStateChanged(CheckStateChangedEvent)
- */
- public void checkStateChanged(CheckStateChangedEvent event) {
- referencedProjects.put(event.getElement(), new Boolean(event.getChecked()));
- }
-
- protected ITableLabelProvider createLabelProvider() {
- return new ITableLabelProvider() {
- public void dispose() {
- //dispose
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- return workbenchLabelProvider.getImage(element);
- }
-
- /**
- * @see ITableLabelProvider#getColumnText(Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- return workbenchLabelProvider.getText(element);
- }
-
- public void addListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- //do nothing
- }
- };
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARDialog.java
deleted file mode 100644
index 76ca214..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARDialog.java
+++ /dev/null
@@ -1,67 +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.jst.j2ee.internal.dialogs;
-
-
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class DeleteEARDialog extends J2EEDeleteDialog {
- protected DeleteEARComposite deleteComposite;
- protected Set referencedProjects;
-
- /**
- * Constructor for DeleteEARDialog.
- *
- * @param parentShell
- * @param dialogTitle
- */
- public DeleteEARDialog(Shell parentShell, Set referencedProjects) {
- super(parentShell, DELETE_EAR_OPTIONS);
- this.referencedProjects = referencedProjects;
- }
-
-
- /**
- * @see MessageDialog#createCustomArea(Composite)
- */
- protected Control createCustomArea(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.DELEATE_EAR_DIALOG_1); //$NON-NLS-1$
- deleteComposite = new DeleteEARComposite(parent, this, SWT.NONE, referencedProjects);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.horizontalIndent = 10;
- deleteComposite.setLayoutData(data);
- return deleteComposite;
- }
-
- /**
- * @see J2EEDeleteDialog#createDeleteOptions()
- */
- public void createDeleteOptions() {
- deleteOptions = deleteComposite.createDeleteOptions();
- }
-
- /**
- * @see org.eclipse.jface.window.Window#getContents()
- */
- public Control getContents() {
- return super.getContents();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleComposite.java
deleted file mode 100644
index ceda40a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleComposite.java
+++ /dev/null
@@ -1,127 +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.jst.j2ee.internal.dialogs;
-
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-
-public class DeleteModuleComposite extends Composite implements J2EEDeleteUIConstants, Listener {
-
- // protected Button deleteProjectsCheckBox;
- protected Button deleteAppProjectsBtn;
- protected Button deleteRefProjectsBtn;
- protected Composite radioComposite;
- protected DeleteModuleReferencesComposite moduleRefsComposite;
-
-
- /**
- * Constructor for DeleteModuleComposite.
- *
- * @param parent
- * @param style
- */
- public DeleteModuleComposite(Composite parent, int style) {
- super(parent, style);
- addChildren();
-
- }
-
- protected void addChildren() {
- addDeleteProjectsGroup();
- addDeleteModuleRefsComposite();
- //set default values
- deleteAppProjectsBtn.setSelection(true);
- deleteAppProjectsBtnSelected();
- }
-
- protected void addDeleteProjectsGroup() {
- GridLayout lay = new GridLayout();
- lay.numColumns = 1;
- setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- setLayoutData(data);
-
- radioComposite = new Composite(this, SWT.NONE);
- lay = new GridLayout();
- lay.numColumns = 2;
- radioComposite.setLayout(lay);
- data = new GridData(GridData.FILL_BOTH);
- radioComposite.setLayoutData(data);
- deleteAppProjectsBtn = new Button(radioComposite, SWT.RADIO);
- deleteAppProjectsBtn.setText(DELETE_PROJECTS_ONLY);
- deleteAppProjectsBtn.addListener(SWT.Selection, this);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- deleteAppProjectsBtn.setLayoutData(data);
-
- deleteRefProjectsBtn = new Button(radioComposite, SWT.RADIO);
- deleteRefProjectsBtn.setText(DELETE_PROJECT_REFERENCES);
- deleteRefProjectsBtn.addListener(SWT.Selection, this);
- deleteRefProjectsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- }
-
- protected void addDeleteModuleRefsComposite() {
- moduleRefsComposite = new DeleteModuleReferencesComposite(this, SWT.NONE, false);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- data.horizontalIndent = 10;
- moduleRefsComposite.setLayoutData(data);
- }
-
-
- protected void addSeparator() {
- Label sep = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- sep.setLayoutData(data);
- }
-
- public boolean shouldDeleteProjects() {
- // return deleteProjectsCheckBox.getSelection();
- // the project should be deleted, since delete was the selected action
- return true;
- }
-
-
- public boolean shouldDeleteModuleDependencies() {
- return moduleRefsComposite.shouldDeleteModuleDependencies();
- }
-
- public boolean shouldDeleteModules() {
- return moduleRefsComposite.shouldDeleteModules();
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == deleteAppProjectsBtn)
- deleteAppProjectsBtnSelected();
- else if (event.widget == deleteRefProjectsBtn)
- deleteRefProjectsBtnSelected();
- }
-
- protected void deleteAppProjectsBtnSelected() {
- if (deleteAppProjectsBtn.getSelection()) {
- moduleRefsComposite.setButtonsEnabled(false);
- }
- }
-
- protected void deleteRefProjectsBtnSelected() {
- if (deleteRefProjectsBtn.getSelection()) {
- moduleRefsComposite.setButtonsEnabled(true);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleDialog.java
deleted file mode 100644
index cfb80fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleDialog.java
+++ /dev/null
@@ -1,50 +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.jst.j2ee.internal.dialogs;
-
-
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-public class DeleteModuleDialog extends J2EEDeleteDialog implements J2EEDeleteUIConstants {
-
- protected DeleteModuleComposite deleteComposite;
-
- public DeleteModuleDialog(Shell parentShell) {
- super(parentShell, DELETE_MODULE_OPTIONS);
- }
-
- protected Control createCustomArea(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.DELEATE_MODULE_DIALOG_1); //$NON-NLS-1$
- deleteComposite = new DeleteModuleComposite(parent, SWT.NONE);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.horizontalIndent = 10;
- deleteComposite.setLayoutData(data);
- return deleteComposite;
- }
-
- public void createDeleteOptions() {
- deleteOptions = new DeleteOptions();
- deleteOptions.setDeleteProjects(deleteComposite.shouldDeleteProjects());
- deleteOptions.setDeleteModules(deleteComposite.shouldDeleteModules());
- deleteOptions.setDeleteModuleDependencies(deleteComposite.shouldDeleteModuleDependencies());
- }
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleReferencesComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleReferencesComposite.java
deleted file mode 100644
index 393189d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleReferencesComposite.java
+++ /dev/null
@@ -1,85 +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.jst.j2ee.internal.dialogs;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-public class DeleteModuleReferencesComposite extends Composite implements J2EEDeleteUIConstants, Listener {
-
- protected Button deleteModulesCheckbox;
- protected Button deleteModuleDependenciesCheckbox;
- protected boolean isEARDelete;
-
- /**
- * Constructor for DeleteModuleReferencesComposite.
- *
- * @param parent
- * @param style
- */
- public DeleteModuleReferencesComposite(Composite parent, int style, boolean isEARDelete) {
- super(parent, style);
- this.isEARDelete = isEARDelete;
- addChildren();
- }
-
- protected void addChildren() {
- GridLayout lay = new GridLayout();
- lay.numColumns = 1;
- setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- setLayoutData(data);
-
- addDeleteModulesCheckbox();
- addDeleteModuleDependenciesCheckbox();
- }
-
- protected void addDeleteModuleDependenciesCheckbox() {
- deleteModuleDependenciesCheckbox = new Button(this, SWT.CHECK);
- deleteModuleDependenciesCheckbox.setText(DELETE_MODULE_DEPENDENCIES);
-
- }
-
- protected void addDeleteModulesCheckbox() {
- deleteModulesCheckbox = new Button(this, SWT.CHECK);
- String label = isEARDelete ? DELETE_MODULES_OTHER : DELETE_MODULES;
- deleteModulesCheckbox.setText(label);
- deleteModulesCheckbox.addListener(SWT.Selection, this);
- }
-
- public boolean shouldDeleteModuleDependencies() {
- return deleteModuleDependenciesCheckbox.getSelection();
- }
-
- public boolean shouldDeleteModules() {
- return deleteModulesCheckbox.getSelection();
- }
-
- public void setButtonsEnabled(boolean enabled) {
- deleteModuleDependenciesCheckbox.setSelection(enabled);
- deleteModulesCheckbox.setSelection(enabled);
- deleteModuleDependenciesCheckbox.setEnabled(enabled);
- deleteModulesCheckbox.setEnabled(enabled);
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == deleteModulesCheckbox && deleteModulesCheckbox.getSelection() && !deleteModuleDependenciesCheckbox.getSelection())
- deleteModuleDependenciesCheckbox.setSelection(true);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java
deleted file mode 100644
index 5442f2c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java
+++ /dev/null
@@ -1,75 +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.jst.j2ee.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class FilteredFileSelectionDialog extends ElementTreeSelectionDialog {
- protected String[] fExtensions;
- /**
- * FilteredFileSelectionDialog constructor comment.
- *
- * @param parent
- * Shell
- * @parent extensions String[]
- */
- public FilteredFileSelectionDialog(Shell parent, String[] extensions) {
- this(parent, null, null, extensions, false);
- }
- /**
- * FilteredFileSelectionDialog constructor comment.
- *
- * @param parent
- * Shell
- * @param title
- * String
- * @param message
- * String
- * @parent extensions String[]
- * @param allowMultiple
- * boolean
- */
- public FilteredFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple) {
- super(parent, new WorkbenchLabelProvider(), new WorkbenchContentProvider());
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- setTitle(title);
- if (title == null)
- setTitle(J2EEUIMessages.getResourceString("File_Selection_UI_")); //$NON-NLS-1$
- if (message == null)
- message = J2EEUIMessages.getResourceString("Select_a_file__UI_"); //$NON-NLS-1$
- setMessage(message);
- setAllowMultiple(true);
- setExtensions(extensions);
- addFilter(new TypedFileViewerFilter(extensions));
- setValidator(new TypedElementSelectionValidator(new Class[]{IFile.class}, allowMultiple));
-
- }
- public String[] getExtensions() {
- return fExtensions;
- }
- public void setExtensions(String[] extensions) {
- fExtensions = extensions;
- }
-
- public void setHelp(String helpCode) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(this.getParentShell(), helpCode); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteDialog.java
deleted file mode 100644
index be97f20..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteDialog.java
+++ /dev/null
@@ -1,50 +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.jst.j2ee.internal.dialogs;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.swt.widgets.Shell;
-
-
-public abstract class J2EEDeleteDialog extends MessageDialog implements J2EEDeleteUIConstants {
-
- protected DeleteOptions deleteOptions;
-
- /**
- * Constructor for J2EEDeleteDialog.
- *
- * @param parentShell
- * @param dialogTitle
- * @param dialogTitleImage
- * @param dialogMessage
- * @param dialogImageType
- * @param dialogButtonLabels
- * @param defaultIndex
- */
- public J2EEDeleteDialog(Shell parentShell, String dialogTitle) {
- super(parentShell, dialogTitle, null, DELETE_DIALOG_MESSAGE, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0);
- }
-
- public DeleteOptions getDeleteOptions() {
- return deleteOptions;
- }
-
-
- public abstract void createDeleteOptions();
-
- protected void buttonPressed(int buttonId) {
- if (buttonId == 0)
- createDeleteOptions();
- super.buttonPressed(buttonId);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteUIConstants.java
deleted file mode 100644
index 2ae744b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteUIConstants.java
+++ /dev/null
@@ -1,29 +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.jst.j2ee.internal.dialogs;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public interface J2EEDeleteUIConstants {
- String DELETE = J2EEUIMessages.getResourceString("Delete_1"); //$NON-NLS-1$
- String DELETE_PROJECTS = J2EEUIMessages.getResourceString("Delete_selected_project(s)_2"); //$NON-NLS-1$
- String DELETE_MODULES = J2EEUIMessages.getResourceString("Remove_module(s)_from_all_Enterprise_Applications_3"); //$NON-NLS-1$
- String DELETE_MODULES_OTHER = J2EEUIMessages.getResourceString("Remove_module(s)_from_all_other_Enterprise_Applications_4"); //$NON-NLS-1$
- String DELETE_MODULE_DEPENDENCIES = J2EEUIMessages.getResourceString("Remove_module_dependencies_referencing_selected_project(s)_5"); //$NON-NLS-1$
- String DELETE_MODULE_OPTIONS = J2EEUIMessages.getResourceString("Delete_Module_Options_6"); //$NON-NLS-1$
- String DELETE_EAR_OPTIONS = J2EEUIMessages.getResourceString("Delete_Enterprise_Application_Options_7"); //$NON-NLS-1$
- String DELETE_NOT_COMPLETED = J2EEUIMessages.getResourceString("Delete_could_not_be_completed_8"); //$NON-NLS-1$
- String DELETE_ERROR = J2EEUIMessages.getResourceString("Delete_error_9"); //$NON-NLS-1$
- String DELETE_DIALOG_MESSAGE = J2EEUIMessages.getResourceString("What_would_you_like_to_delete__10"); //$NON-NLS-1$
- String DELETE_EAR_PROJECTS = J2EEUIMessages.getResourceString("Delete_selected_Enterprise_Application_project(s)_only_11"); //$NON-NLS-1$
- String DELETE_REFERENCED_PROJECTS = J2EEUIMessages.getResourceString("Also_delete_module_and_utility_Java_projects_12"); //$NON-NLS-1$
- String DELETE_PROJECTS_ONLY = J2EEUIMessages.getResourceString("Delete_selected_project(s)_only_13"); //$NON-NLS-1$
- String DELETE_PROJECT_REFERENCES = J2EEUIMessages.getResourceString("Also_delete_references_to_selected_project(s)_14"); //$NON-NLS-1$
- String CUSTOM_DELETE_MIX_MATCH = J2EEUIMessages.getResourceString("CUSTOM_DELETE_MIX_MATCH_UI_"); //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java
deleted file mode 100644
index 9e29ba9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java
+++ /dev/null
@@ -1,334 +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
- *******************************************************************************/
-/*
- * Created on May 11, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author sagarwal
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class J2EEDeployStatusDialog extends ProgressMonitorDialog implements J2EEDeployUIConstants {
-
- /**
- * Reserve room for this many list items.
- */
- private static final int LIST_ITEM_COUNT = 7;
- private int severity = IStatus.OK;
- public Color DESC_COLOR = new Color(null, 255, 255, 255);
- /**
- * The Details button.
- */
- private Button detailsButton;
-
- /**
- * The SWT list control that displays the error details.
- */
- private Text text;
-
- /**
- * Indicates whether the error details viewer is currently created.
- */
- private boolean textCreated = false;
-
- /**
- * List of the main error object's detailed errors (element type:
- * <code>J2EEMigrationStatus</code>).
- */
- private java.util.List statusList;
-
- /**
- * @param parent
- */
- public J2EEDeployStatusDialog(Shell parent, List status) {
- super(parent);
- setShellStyle(SWT.BORDER | SWT.TITLE | SWT.APPLICATION_MODAL | SWT.RESIZE); // no
- statusList = status;
- }
-
- /**
- * Called just after the operation is run. Default behaviour is to decrement the nesting depth,
- * and close the dialog.
- *
- * @plannedfor 3.0
- */
- protected void finishedRun() {
- decrementNestingDepth();
- clearCursors();
- cancel.setEnabled(true);
- detailsButton.setEnabled(true);
- computeSeverity();
- setDeploymentStatus();
- }
-
- /**
- *
- */
- private void setDeploymentStatus() {
- setMessageOrDefault();
- imageLabel.setImage(getImage());
- }
-
- protected void setMessageOrDefault() {
- switch (getSeverity()) {
- case IStatus.ERROR :
- message = DEPLOY_ERRORS_REPORT;
- break;
- case IStatus.WARNING :
- message = DEPLOY_WARNINGS_REPORT;
- break;
- default :
- message = DEPLOY_SUCCESS_REPORT;
- break;
- }
- setMessage(message);
- }
-
-
- protected void createCancelButton(Composite parent) {
- super.createCancelButton(parent);
- cancel.setText(IDialogConstants.OK_LABEL);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent) {
- // cancel button
- createCancelButton(parent);
- detailsButton = createButton(parent, IDialogConstants.DETAILS_ID, IDialogConstants.SHOW_DETAILS_LABEL, false);
- detailsButton.setEnabled(false);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok or Details button in
- * this dialog. If the Ok button was pressed then close this dialog. If the Details button was
- * pressed then toggle the displaying of the error details area. Note that the Details button
- * will only be visible if the error being displayed specifies child details.
- */
- protected void buttonPressed(int id) {
- if (id == IDialogConstants.DETAILS_ID) { // was the details button pressed?
- toggleDetailsArea();
- } else {
- logStatus();
- super.buttonPressed(id);
-
- }
- }
-
- /*
- * @see org.eclipse.jface.dialogs.IconAndMessageDialog#getImage()
- */
-
-
- protected Image getImage() {
- switch (getSeverity()) {
- case IStatus.ERROR :
- return this.getErrorImage();
- case IStatus.WARNING :
- return this.getWarningImage();
- default :
- return this.getInfoImage();
- }
- }
-
- protected Text createDropDownText(Composite parent) {
- // create the list
- text = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
- // fill the list
- populateText(text);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- data.horizontalSpan = 2;
- data.heightHint = text.getLineHeight() * LIST_ITEM_COUNT;
- text.setLayoutData(data);
- textCreated = true;
- return text;
- }
-
- private void logStatus() {
- Iterator aenum = statusList.iterator();
- StringBuffer sb = new StringBuffer();
- sb.append(message);
- while (aenum.hasNext()) {
- IStatus childStatus = (IStatus) aenum.next();
- populateText(sb, childStatus, 0);
- }
- Logger.getLogger().logInfo(sb.toString());
-
- }
-
- /**
- * Populates the list using this error dialog's status object. This walks the child stati of the
- * status object and displays them in a list. The format for each entry is status_path :
- * status_message If the status's path was null then it (and the colon) are omitted.
- */
- private void populateText(Text someText) {
- Iterator aenum = statusList.iterator();
- StringBuffer sb = new StringBuffer();
- while (aenum.hasNext()) {
- IStatus childStatus = (IStatus) aenum.next();
- //sb.append("Deployment results for " + childStatus.);
- populateText(sb, childStatus, 0);
- }
- someText.setText(sb.toString());
-
- }
-
- private void populateText(StringBuffer sb, IStatus status, int nesting) {
- for (int i = 0; i < nesting; i++) {
- sb.append(" "); //$NON-NLS-1$
- }
- sb.append(getMessageForDisplay(status));
- sb.append('\n');
- IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++) {
- populateText(sb, children[i], nesting + 1);
- }
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user pressing the details
- * button.
- */
- private void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- if (textCreated) {
- text.dispose();
- textCreated = false;
- detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- text = createDropDownText((Composite) getContents());
- detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
- text.setEditable(false);
- text.setBackground(DESC_COLOR);
- }
-
- Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
- }
-
- public String getMessageForDisplay(IStatus status) {
- String messageString = status.getMessage();
- return messageString;
-
- }
-
- protected String getSeverityText(IStatus status) {
- switch (status.getSeverity()) {
- case IStatus.ERROR :
- return ERROR_TEXT;
- case IStatus.WARNING :
- return WARNING_TEXT;
- case IStatus.INFO :
- return INFO_TEXT;
- case IStatus.OK :
- return OK_TEXT;
- default :
- return ""; //$NON-NLS-1$
- }
- }
-
- private void setSeverity(int sev) {
- if (severity == IStatus.ERROR)
- return;
- if (sev == IStatus.ERROR)
- severity = IStatus.ERROR;
- else if (sev == IStatus.WARNING) {
- severity = IStatus.WARNING;
- }
- }
-
- private int getSeverity() {
- return severity;
- }
-
- private int computeSeverity() {
- Iterator aenum = statusList.iterator();
- while (aenum.hasNext()) {
- IStatus childStatus = (IStatus) aenum.next();
- setSeverity(childStatus.getSeverity());
- if (getSeverity() == IStatus.ERROR)
- return getSeverity();
- computeSeverity(childStatus);
- if (getSeverity() == IStatus.ERROR)
- getSeverity();
- }
- return getSeverity();
- }
-
- private void computeSeverity(IStatus status) {
- IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++) {
- computeSeverity(children[i]);
- if (getSeverity() == IStatus.ERROR)
- return;
- }
- }
-
- /*
- * (non-Javadoc) Method declared in Window.
- */
- protected void configureShell(Shell shell) {
- super.configureShell(shell);
- shell.setText(DEPLOY_DIALOG_TITLE);
- //shell.setSize(600,200); don't set the size this breaks the dialog for linux.
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected Control createDialogArea(Composite parent) {
- Control control = super.createDialogArea(parent);
- setMessage(DEPLOYMENT_IN_PROGRESS);
- return control;
- }
-
- /**
- * Set the message in the message label.
- */
- private void setMessage(String messageString) {
- //must not set null text in a label
- message = messageString == null ? "" : messageString; //$NON-NLS-1$
- if (messageLabel == null || messageLabel.isDisposed())
- return;
- messageLabel.setText(message);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployUIConstants.java
deleted file mode 100644
index dfe3589..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployUIConstants.java
+++ /dev/null
@@ -1,23 +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.jst.j2ee.internal.dialogs;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public interface J2EEDeployUIConstants {
- public static final String ERROR_TEXT = J2EEUIMessages.getResourceString("DEPLOY_ERROR_TEXT"); //$NON-NLS-1$
- public static final String WARNING_TEXT = J2EEUIMessages.getResourceString("DEPLOY_WARNING_TEXT"); //$NON-NLS-1$
- public static final String INFO_TEXT = J2EEUIMessages.getResourceString("DEPLOY_INFO_TEXT"); //$NON-NLS-1$
- public static final String OK_TEXT = J2EEUIMessages.getResourceString("DEPLOY_OK_TEXT"); //$NON-NLS-1$
- public static final String DEPLOYMENT_IN_PROGRESS = J2EEUIMessages.getResourceString("DEPLOYMENT_IN_PROGRESS"); //$NON-NLS-1$
- public static final String DEPLOY_SUCCESS_REPORT = J2EEUIMessages.getResourceString("DEPLOY_SUCCESS_REPORT"); //$NON-NLS-1$
- public static final String DEPLOY_WARNINGS_REPORT = J2EEUIMessages.getResourceString("DEPLOY_WARNINGS_REPORT"); //$NON-NLS-1$
- public static final String DEPLOY_ERRORS_REPORT = J2EEUIMessages.getResourceString("DEPLOY_ERRORS_REPORT"); //$NON-NLS-1$
- public static final String DEPLOY_DIALOG_TITLE = J2EEUIMessages.getResourceString("DEPLOY_DIALOG_TITLE"); //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameDialog.java
deleted file mode 100644
index 6dcbf11..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameDialog.java
+++ /dev/null
@@ -1,51 +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.jst.j2ee.internal.dialogs;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.widgets.Shell;
-
-
-public abstract class J2EERenameDialog extends MessageDialog implements J2EERenameUIConstants {
-
- protected RenameOptions renameOptions;
- protected String currentName = null;
-
- /**
- * Constructor for J2EERenameDialog.
- *
- * @param parentShell
- * @param dialogTitle
- * @param dialogTitleImage
- * @param dialogMessage
- * @param dialogImageType
- * @param dialogButtonLabels
- * @param defaultIndex
- */
- public J2EERenameDialog(Shell parentShell, String dialogTitle, String name) {
- super(parentShell, dialogTitle, null, RENAME_DIALOG_MESSAGE, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0);
- currentName = name;
- }
-
- public RenameOptions getRenameOptions() {
- return renameOptions;
- }
-
-
- public abstract void createRenameOptions();
-
- protected void buttonPressed(int buttonId) {
- if (buttonId == 0)
- createRenameOptions();
- super.buttonPressed(buttonId);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameUIConstants.java
deleted file mode 100644
index baa574d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameUIConstants.java
+++ /dev/null
@@ -1,27 +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.jst.j2ee.internal.dialogs;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public interface J2EERenameUIConstants {
- String RENAME = J2EEUIMessages.getResourceString("Rename_1"); //$NON-NLS-1$
- String RENAME_PROJECTS = J2EEUIMessages.getResourceString("Rename_selected_project_2"); //$NON-NLS-1$
- String RENAME_MODULES = J2EEUIMessages.getResourceString("Rename_module_in_all_Enterprise_Applications_3"); //$NON-NLS-1$
- String RENAME_MODULES_OTHER = J2EEUIMessages.getResourceString("Rename_module_in_all_other_Enterprise_Applications_4"); //$NON-NLS-1$
- String RENAME_MODULE_DEPENDENCIES = J2EEUIMessages.getResourceString("Rename_module_dependencies_referencing_selected_project_5"); //$NON-NLS-1$
- String RENAME_MODULE_OPTIONS = J2EEUIMessages.getResourceString("Rename_Module_Options_6"); //$NON-NLS-1$
- String RENAME_EAR_OPTIONS = J2EEUIMessages.getResourceString("Rename_Enterprise_Application_Options_7"); //$NON-NLS-1$
- String RENAME_NOT_COMPLETED = J2EEUIMessages.getResourceString("Rename_could_not_be_completed_8"); //$NON-NLS-1$
- String RENAME_ERROR = J2EEUIMessages.getResourceString("Rename_error_9"); //$NON-NLS-1$
- String RENAME_DIALOG_MESSAGE = J2EEUIMessages.getResourceString("What_would_you_like_to_rename_this_to__10"); //$NON-NLS-1$
- String RENAME_CONTEXT_ROOT = J2EEUIMessages.getResourceString("Context_Root__11"); //$NON-NLS-1$
- String RENAME_EAR_PROJECTS = J2EEUIMessages.getResourceString("Rename_selected_Enterprise_Application_project_only_12"); //$NON-NLS-1$
- String RENAME_REFERENCED_PROJECTS = J2EEUIMessages.getResourceString("Also_rename_module_and_utility_Java_projects_13"); //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java
deleted file mode 100644
index 8808b1d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java
+++ /dev/null
@@ -1,211 +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.jst.j2ee.internal.dialogs;
-
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here. Creation date: (9/7/2001 11:28:24 AM)
- *
- * @author: Administrator
- */
-public class ListMessageDialog extends org.eclipse.jface.dialogs.MessageDialog {
- protected String[] listItems;
- protected List list;
-
- /**
- * EJBSelectiveImportDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- }
-
- /**
- * ListMessageDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex, String[] names) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- listItems = names;
- }
-
- /**
- * Creates and returns the contents of an area of the dialog which appears below the message and
- * above the button bar.
- * <p>
- * The default implementation of this framework method returns <code>null</code>. Subclasses
- * may override.
- * </p>
- *
- * @param the
- * parent composite to contain the custom area
- * @return the custom area control, or <code>null</code>
- */
- protected Control createCustomArea(Composite parent) {
-
- Composite composite = new Composite(parent, 0);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- if (listItems != null) {
- list = new List(composite, SWT.BORDER);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- list.setLayoutData(data);
- list.setItems(listItems);
- }
-
- return composite;
-
- }
-
- /**
- * Convenience method to open a simple confirm (OK/Cancel) dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openConfirm(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0, items); // OK
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard error dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openError(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, ERROR, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is the
- // default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a standard information dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openInformation(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, INFORMATION, new String[]{IDialogConstants.OK_LABEL}, 0, items);
- // ok is the default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a simple Yes/No question dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openQuestion(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0, items); // yes
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard warning dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openWarning(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, WARNING, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is
- // the
- // default
- dialog.open();
- return;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARComposite.java
deleted file mode 100644
index c74e3b8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARComposite.java
+++ /dev/null
@@ -1,265 +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.jst.j2ee.internal.dialogs;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-public class RenameEARComposite extends Composite implements J2EERenameUIConstants, Listener, ICheckStateListener {
-
- protected Button renameAppProjectsBtn;
- protected Button renameRefProjectsBtn;
- protected Composite radioComposite;
- protected Button detailsBtn;
- protected RenameModuleReferencesComposite moduleRefsComposite;
- protected CheckboxTableViewer projectsList;
- protected boolean listCreated = false;
- protected Map referencedProjects;
- protected WorkbenchLabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
-
- /**
- * Constructor for RenameEARComposite.
- *
- * @param parent
- * @param style
- */
- public RenameEARComposite(Composite parent, int style, Set referencedProjects) {
- super(parent, style);
- initReferencedProjects(referencedProjects);
- addChildren();
- }
-
- /**
- * Answer the referenced projects which the user has chosen to also rename
- */
- public java.util.List getSelectedReferencedProjects() {
- if (renameAppProjectsBtn.getSelection())
- return Collections.EMPTY_LIST;
- java.util.List result = new ArrayList();
- for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
- Map.Entry element = (Map.Entry) iter.next();
- boolean isSelected = ((Boolean) element.getValue()).booleanValue();
- if (isSelected)
- result.add(element.getKey());
- }
- return result;
- }
-
- /**
- * @see J2EERenameDialog#createRenameOptions()
- */
- public RenameOptions createRenameOptions() {
- RenameOptions opts = new RenameOptions();
- opts.setIsEARRename(true);
- opts.setRenameProjects(true);
- opts.setRenameModuleDependencies(moduleRefsComposite.shouldRenameModuleDependencies());
- opts.setRenameModules(moduleRefsComposite.shouldRenameModules());
- opts.setSelectedReferencedProjects(getSelectedReferencedProjects());
- return opts;
- }
-
-
-
- protected void initReferencedProjects(Set projects) {
- referencedProjects = new HashMap();
- for (Iterator iter = projects.iterator(); iter.hasNext();) {
- IProject project = (IProject) iter.next();
- referencedProjects.put(project, Boolean.TRUE);
- }
- }
-
- protected void addChildren() {
- setLayout();
- addRadioComposite();
- moduleRefsComposite = new RenameModuleReferencesComposite(this, SWT.NONE, true);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- data.horizontalIndent = 10;
- moduleRefsComposite.setLayoutData(data);
- }
-
- protected void setLayout() {
- GridLayout lay = new GridLayout();
- lay.numColumns = 1;
- setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- setLayoutData(data);
- }
-
- protected void addRadioComposite() {
- radioComposite = new Composite(this, SWT.NONE);
- GridLayout lay = new GridLayout();
- lay.numColumns = 2;
- radioComposite.setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- radioComposite.setLayoutData(data);
- renameAppProjectsBtn = new Button(radioComposite, SWT.RADIO);
- renameAppProjectsBtn.setText(RENAME_EAR_PROJECTS);
- renameAppProjectsBtn.addListener(SWT.Selection, this);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- renameAppProjectsBtn.setLayoutData(data);
-
- renameRefProjectsBtn = new Button(radioComposite, SWT.RADIO);
- renameRefProjectsBtn.setText(RENAME_REFERENCED_PROJECTS);
- renameRefProjectsBtn.addListener(SWT.Selection, this);
- renameRefProjectsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- detailsBtn = new Button(radioComposite, SWT.PUSH);
- detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
- detailsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
- detailsBtn.addListener(SWT.Selection, this);
- detailsBtn.setEnabled(false);
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == renameAppProjectsBtn)
- renameAppProjectsBtnSelected();
- else if (event.widget == renameRefProjectsBtn)
- renameRefProjectsBtnSelected();
- else if (event.widget == detailsBtn)
- detailsBtnSelected();
- }
-
- protected void renameAppProjectsBtnSelected() {
- if (renameAppProjectsBtn.getSelection()) {
- if (listCreated)
- toggleDetailsArea();
- detailsBtn.setEnabled(false);
- moduleRefsComposite.setButtonsEnabled(false);
- }
- }
-
- protected void renameRefProjectsBtnSelected() {
- if (renameRefProjectsBtn.getSelection()) {
- detailsBtn.setEnabled(true);
- moduleRefsComposite.setButtonsEnabled(true);
- }
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user pressing the details
- * button.
- */
- protected void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = getParent().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- if (listCreated) {
- projectsList.getControl().dispose();
- listCreated = false;
- detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- createDropDownList();
- detailsBtn.setText(IDialogConstants.HIDE_DETAILS_LABEL);
- }
-
- Point newSize = getParent().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
- }
-
- protected void createDropDownList() {
- // create the list
- projectsList = CheckboxTableViewer.newCheckList(radioComposite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- projectsList.setLabelProvider(createLabelProvider());
- projectsList.setSorter(new ViewerSorter() {/*viewersorter*/});
- projectsList.addCheckStateListener(this);
- // fill the list
- populateList();
-
- GridData data = new GridData(GridData.FILL_BOTH);
- data.heightHint = projectsList.getTable().getItemHeight() * referencedProjects.size();
- data.horizontalSpan = 2;
- data.horizontalIndent = 10;
- projectsList.getTable().setLayoutData(data);
-
- listCreated = true;
- }
-
- protected void populateList() {
- for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
- projectsList.add(entry.getKey());
- boolean checked = ((Boolean) entry.getValue()).booleanValue();
- projectsList.setChecked(entry.getKey(), checked);
- }
- }
-
- protected void detailsBtnSelected() {
- toggleDetailsArea();
- }
-
- /**
- * @see ICheckStateListener#checkStateChanged(CheckStateChangedEvent)
- */
- public void checkStateChanged(CheckStateChangedEvent event) {
- referencedProjects.put(event.getElement(), new Boolean(event.getChecked()));
- }
-
- protected ITableLabelProvider createLabelProvider() {
- return new ITableLabelProvider() {
- public void dispose() {
- //dispose
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- return workbenchLabelProvider.getImage(element);
- }
-
- /**
- * @see ITableLabelProvider#getColumnText(Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- return workbenchLabelProvider.getText(element);
- }
-
- public void addListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- //do nothing
- }
- };
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java
deleted file mode 100644
index e9cc80e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java
+++ /dev/null
@@ -1,61 +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.jst.j2ee.internal.dialogs;
-
-
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class RenameEARDialog extends J2EERenameDialog {
- protected RenameEARComposite renameComposite;
- protected Set referencedProjects;
-
- /**
- * Constructor for RenameEARDialog.
- *
- * @param parentShell
- * @param dialogTitle
- */
- public RenameEARDialog(Shell parentShell, Set referencedProjects, String name) {
- super(parentShell, RENAME_EAR_OPTIONS, name);
- this.referencedProjects = referencedProjects;
- }
-
-
- /**
- * @see MessageDialog#createCustomArea(Composite)
- */
- protected Control createCustomArea(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.RENAME_EAR_DIALOG_1); //$NON-NLS-1$
- renameComposite = new RenameEARComposite(parent, SWT.NONE, referencedProjects);
- // renameComposite.setNewName(currentName);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.horizontalIndent = 10;
- renameComposite.setLayoutData(data);
- return renameComposite;
- }
-
- /**
- * @see J2EERenameDialog#createRenameOptions()
- */
- public void createRenameOptions() {
- renameOptions = renameComposite.createRenameOptions();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleComposite.java
deleted file mode 100644
index 0923fce..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleComposite.java
+++ /dev/null
@@ -1,181 +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.jst.j2ee.internal.dialogs;
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.resource.JFaceColors;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-
-
-public class RenameModuleComposite extends Composite implements J2EERenameUIConstants, Listener {
-
- // protected Button renameProjectsCheckBox;
- protected RenameModuleReferencesComposite moduleRefsComposite;
- protected Text newNameText = null;
- protected Text newContextRootText = null;
- protected Label newContextRootLabel = null;
- protected String oldName = null;
- protected Button OKButton = null;
- protected Label statusMessageLabel = null;
-
- /**
- * Constructor for RenameModuleComposite.
- *
- * @param parent
- * @param style
- */
- public RenameModuleComposite(Composite parent, int style) {
- super(parent, style);
- addChildren();
- }
-
- protected void addChildren() {
- addRenameProjectsGroup();
- addSeparator();
- addRenameModuleRefsComposite();
- //Add in a label for status messages if required
- statusMessageLabel = new Label(this, SWT.NONE);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 2;
- statusMessageLabel.setLayoutData(data);
- statusMessageLabel.setFont(this.getFont());
- }
-
- protected void addRenameProjectsGroup() {
- GridLayout lay = new GridLayout();
- lay.numColumns = 2;
- setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- setLayoutData(data);
-
- newNameText = new Text(this, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- newNameText.setLayoutData(data);
-
- newContextRootLabel = new Label(this, SWT.NONE);
- newContextRootLabel.setText(RENAME_CONTEXT_ROOT);
- data = new GridData(GridData.FILL_HORIZONTAL);
- newContextRootLabel.setLayoutData(data);
-
- newContextRootText = new Text(this, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- newContextRootText.setLayoutData(data);
-
- /*
- * renameProjectsCheckBox = new Button(this, SWT.CHECK);
- * renameProjectsCheckBox.setText(RENAME_PROJECTS);
- * renameProjectsCheckBox.setSelection(true);
- * renameProjectsCheckBox.addListener(SWT.Selection, this); data = new
- * GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2;
- * renameProjectsCheckBox.setLayoutData(data);
- */
- }
-
- protected void addRenameModuleRefsComposite() {
- moduleRefsComposite = new RenameModuleReferencesComposite(this, SWT.NONE, false);
- }
-
- protected void addSeparator() {
- Label sep = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- sep.setLayoutData(data);
- }
-
- public boolean shouldRenameProjects() {
- // return renameProjectsCheckBox.getSelection();
- // always rename the project
- return true;
- }
-
- public boolean shouldRenameModuleDependencies() {
- return moduleRefsComposite.shouldRenameModuleDependencies();
- }
-
- public boolean shouldRenameModules() {
- return moduleRefsComposite.shouldRenameModules();
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == newNameText && OKButton != null) {
- String newName = newNameText.getText();
- if (newName.trim().length() == 0) {
- statusMessageLabel.setText("");//$NON-NLS-1$
- OKButton.setEnabled(false);
- return;
- }
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject newProject = root.getProject(newName);
- if (newProject.exists()) {
- statusMessageLabel.setForeground(JFaceColors.getErrorText(statusMessageLabel.getDisplay()));
- String[] names = {newName};
- statusMessageLabel.setText(MessageFormat.format(J2EEUIMessages.getResourceString("Project_already_exists."), names)); //$NON-NLS-1$
- OKButton.setEnabled(false);
- } else {
- statusMessageLabel.setText("");//$NON-NLS-1$
- OKButton.setEnabled(true);
- }
- }
- }
-
- public String getNewName()
-
- {
- return newNameText.getText();
- }
-
- public void setNewName(String newName) {
- oldName = newName;
- newNameText.setText(newName);
- newNameText.selectAll();
- newNameText.addListener(SWT.Modify, this);
- }
-
- public String getNewContextRoot() {
- return newContextRootText.getText();
- }
-
- public void setNewContextRoot(String newContextRoot) {
- if (newContextRoot != null && newContextRoot.length() > 1) {
- newContextRootText.setText(newContextRoot);
- } else {
- newContextRootLabel.setVisible(false);
- newContextRootText.setVisible(false);
- }
- }
-
- /**
- * Sets the OKButton.
- *
- * @param OKButton
- * The OKButton to set
- */
- public void setOKButton(Button oKButton) {
- OKButton = oKButton;
- OKButton.setEnabled(false);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleDialog.java
deleted file mode 100644
index a5ea814..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleDialog.java
+++ /dev/null
@@ -1,65 +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.jst.j2ee.internal.dialogs;
-
-
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-public class RenameModuleDialog extends J2EERenameDialog implements J2EERenameUIConstants {
-
- protected RenameModuleComposite renameComposite;
- protected String contextRoot = null;
-
- public RenameModuleDialog(Shell parentShell, String name, String oldContextRoot) {
- super(parentShell, RENAME_MODULE_OPTIONS, name);
- contextRoot = oldContextRoot;
- }
-
- protected Control createCustomArea(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.RENAME_MODULE_DIALOG_1); //$NON-NLS-1$
- renameComposite = new RenameModuleComposite(parent, SWT.NONE);
- renameComposite.setNewName(currentName);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.horizontalIndent = 10;
- renameComposite.setLayoutData(data);
- renameComposite.setNewContextRoot(contextRoot);
- return renameComposite;
- }
-
- public void createRenameOptions() {
- renameOptions = new RenameOptions();
- renameOptions.setRenameProjects(renameComposite.shouldRenameProjects());
- renameOptions.setRenameModules(renameComposite.shouldRenameModules());
- renameOptions.setRenameModuleDependencies(renameComposite.shouldRenameModuleDependencies());
- renameOptions.setNewName(renameComposite.getNewName());
- renameOptions.setNewContextRoot(renameComposite.getNewContextRoot());
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent) {
- Button OKButton = null;
- super.createButtonsForButtonBar(parent);
- OKButton = getButton(0);
- renameComposite.setOKButton(OKButton);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleReferencesComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleReferencesComposite.java
deleted file mode 100644
index 7614aab..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleReferencesComposite.java
+++ /dev/null
@@ -1,88 +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.jst.j2ee.internal.dialogs;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-public class RenameModuleReferencesComposite extends Composite implements J2EERenameUIConstants, Listener {
-
- protected Button renameModulesCheckbox;
- protected Button renameModuleDependenciesCheckbox;
- protected boolean isEARRename;
-
- /**
- * Constructor for RenameModuleReferencesComposite.
- *
- * @param parent
- * @param style
- */
- public RenameModuleReferencesComposite(Composite parent, int style, boolean isEARRename) {
- super(parent, style);
- this.isEARRename = isEARRename;
- addChildren();
- }
-
- protected void addChildren() {
- GridLayout lay = new GridLayout();
- lay.numColumns = 1;
- setLayout(lay);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 2;
- setLayoutData(data);
-
- addRenameModulesCheckbox();
- addRenameModuleDependenciesCheckbox();
- }
-
- protected void addRenameModuleDependenciesCheckbox() {
- renameModuleDependenciesCheckbox = new Button(this, SWT.CHECK);
- renameModuleDependenciesCheckbox.setSelection(true);
- renameModuleDependenciesCheckbox.setText(RENAME_MODULE_DEPENDENCIES);
-
- }
-
- protected void addRenameModulesCheckbox() {
- renameModulesCheckbox = new Button(this, SWT.CHECK);
- renameModulesCheckbox.setSelection(true);
- String label = isEARRename ? RENAME_MODULES_OTHER : RENAME_MODULES;
- renameModulesCheckbox.setText(label);
- renameModulesCheckbox.addListener(SWT.Selection, this);
- }
-
- public boolean shouldRenameModuleDependencies() {
- return renameModuleDependenciesCheckbox.getSelection();
- }
-
- public boolean shouldRenameModules() {
- return renameModulesCheckbox.getSelection();
- }
-
- public void setButtonsEnabled(boolean enabled) {
- renameModuleDependenciesCheckbox.setSelection(enabled);
- renameModulesCheckbox.setSelection(enabled);
- renameModuleDependenciesCheckbox.setEnabled(enabled);
- renameModulesCheckbox.setEnabled(enabled);
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == renameModulesCheckbox && renameModulesCheckbox.getSelection() && !renameModuleDependenciesCheckbox.getSelection())
- renameModuleDependenciesCheckbox.setSelection(true);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java
deleted file mode 100644
index 62d6907..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java
+++ /dev/null
@@ -1,126 +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.jst.j2ee.internal.dialogs;
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-import java.util.Comparator;
-
-import org.eclipse.jface.util.Assert;
-
-/**
- * Quick sort to sort key-value pairs. The keys and arrays are specified in
- * separate arrays.
- *
- * @plannedfor 2.0
- */
-public class TwoArrayQuickSorter {
-
- private Comparator fComparator;
-
- /**
- * Default comparator.
- */
- public static final class StringComparator implements Comparator {
- private boolean fIgnoreCase;
-
- StringComparator(boolean ignoreCase) {
- fIgnoreCase = ignoreCase;
- }
-
- public int compare(Object left, Object right) {
- return fIgnoreCase ? ((String) left).compareToIgnoreCase((String) right) : ((String) left).compareTo((String) right);
- }
- }
-
- /**
- * Creates a sorter with default string comparator. The keys are assumed to
- * be strings.
- *
- * @param ignoreCase
- * specifies whether sorting is case sensitive or not.
- */
- public TwoArrayQuickSorter(boolean ignoreCase) {
- fComparator = new StringComparator(ignoreCase);
- }
-
- /**
- * Creates a sorter with a comparator.
- *
- * @param comparator
- * the comparator to order the elements. The comparator must not
- * be <code>null</code>.
- */
- public TwoArrayQuickSorter(Comparator comparator) {
- fComparator = comparator;
- }
-
- /**
- * Sorts keys and values in parallel.
- *
- * @param keys
- * the keys to use for sorting.
- * @param values
- * the values associated with the keys.
- */
- public void sort(Object[] keys, Object[] values) {
- if ((keys == null) || (values == null)) {
- Assert.isTrue(false, "Either keys or values in null"); //$NON-NLS-1$
- return;
- }
-
- if (keys.length <= 1)
- return;
-
- internalSort(keys, values, 0, keys.length - 1);
- }
-
- private void internalSort(Object[] keys, Object[] values, int left, int right) {
- int original_left = left;
- int original_right = right;
-
- Object mid = keys[(left + right) / 2];
- do {
- while (fComparator.compare(keys[left], mid) < 0)
- left++;
-
- while (fComparator.compare(mid, keys[right]) < 0)
- right--;
-
- if (left <= right) {
- swap(keys, left, right);
- swap(values, left, right);
- left++;
- right--;
- }
- } while (left <= right);
-
- if (original_left < right)
- internalSort(keys, values, original_left, right);
-
- if (left < original_right)
- internalSort(keys, values, left, original_right);
- }
-
- /*
- * Swaps x[a] with x[b].
- */
- private static final void swap(Object x[], int a, int b) {
- Object t = x[a];
- x[a] = x[b];
- x[b] = t;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java
deleted file mode 100644
index 6c430f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java
+++ /dev/null
@@ -1,352 +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.jst.j2ee.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-
-/**
- * This class was derived from JavaSearchScope as that class did not have a
- * provision to exclude classpath entries that are not exported A Java-specific
- * scope for searching relative to one or more java elements.
- */
-public class TypeJavaSearchScope implements IJavaSearchScope {
-
- private boolean includeExportedClassPathEntriesOnly = true;
-
- private ArrayList elements;
-
- /*
- * The paths of the resources in this search scope (or the classpath
- * entries' paths if the resources are projects)
- */
- private IPath[] paths;
- private boolean[] pathWithSubFolders;
- private int pathsCount;
-
- private IPath[] enclosingProjectsAndJars;
-
- public TypeJavaSearchScope() {
- this.initialize();
-
- // disabled for now as this could be expensive
- // JavaModelManager.getJavaModelManager().rememberScope(this);
- }
-
- private void addEnclosingProjectOrJar(IPath path) {
- int length = this.enclosingProjectsAndJars.length;
- for (int i = 0; i < length; i++) {
- if (this.enclosingProjectsAndJars[i].equals(path))
- return;
- }
- System.arraycopy(this.enclosingProjectsAndJars, 0, this.enclosingProjectsAndJars = new IPath[length + 1], 0, length);
- this.enclosingProjectsAndJars[length] = path;
- }
-
- /**
- * Method addProject. This method adds all the classpath entries for the
- * current project to the search scope.
- *
- * @param javaProject
- * @param includesPrereqProjects
- * @param visitedProjects
- * @throws JavaModelException
- */
- public void addProject(IJavaProject javaProject, boolean includesPrereqProjects, HashSet visitedProjects) throws JavaModelException {
- IProject project = javaProject.getProject();
- if (!project.isAccessible() || !visitedProjects.add(project))
- return;
-
- this.addEnclosingProjectOrJar(project.getFullPath());
-
- IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
- IJavaModel model = javaProject.getJavaModel();
- for (int i = 0, length = entries.length; i < length; i++) {
- IClasspathEntry entry = entries[i];
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- IPath path = entry.getPath();
- this.add(path, true);
- this.addEnclosingProjectOrJar(path);
- break;
- case IClasspathEntry.CPE_PROJECT :
- if (includesPrereqProjects) {
- this.add(model.getJavaProject(entry.getPath().lastSegment()), true, visitedProjects);
- }
- break;
- case IClasspathEntry.CPE_SOURCE :
- this.add(entry.getPath(), true);
- break;
- }
- }
- }
-
- /**
- * Method add. This method filters out all the classpath entries of the
- * project which are not exported.
- *
- * @param javaProject
- * @param includesPrereqProjects
- * @param visitedProjects
- * @throws JavaModelException
- */
- public void add(IJavaProject javaProject, boolean includesPrereqProjects, HashSet visitedProjects) throws JavaModelException {
- IProject project = javaProject.getProject();
- if (!project.isAccessible() || !visitedProjects.add(project))
- return;
-
- this.addEnclosingProjectOrJar(project.getFullPath());
-
- IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
- IJavaModel model = javaProject.getJavaModel();
- for (int i = 0, length = entries.length; i < length; i++) {
- IClasspathEntry entry = entries[i];
- if (includeExportedClassPathEntriesOnly()) {
- if (!entry.isExported() && entry.getEntryKind() != IClasspathEntry.CPE_SOURCE)
- continue;
- }
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- IPath path = entry.getPath();
- this.add(path, true);
- this.addEnclosingProjectOrJar(path);
- break;
- case IClasspathEntry.CPE_PROJECT :
- if (includesPrereqProjects) {
- this.add(model.getJavaProject(entry.getPath().lastSegment()), true, visitedProjects);
- }
- break;
- case IClasspathEntry.CPE_SOURCE :
- this.add(entry.getPath(), true);
- break;
- }
- }
- }
- public void add(IJavaElement element) throws JavaModelException {
- IPackageFragmentRoot root = null;
- switch (element.getElementType()) {
- case IJavaElement.JAVA_MODEL :
- // a workspace sope should be used
- break;
- case IJavaElement.JAVA_PROJECT :
- this.add((IJavaProject) element, true, new HashSet(2));
- break;
- case IJavaElement.PACKAGE_FRAGMENT_ROOT :
- root = (IPackageFragmentRoot) element;
- this.add(root.getPath(), true);
- break;
- case IJavaElement.PACKAGE_FRAGMENT :
- root = (IPackageFragmentRoot) element.getParent();
- if (root.isArchive()) {
- this.add(root.getPath().append(new Path(element.getElementName().replace('.', '/'))), false);
- } else {
- IResource resource = element.getUnderlyingResource();
- if (resource != null && resource.isAccessible()) {
- this.add(resource.getFullPath(), false);
- }
- }
- break;
- default :
- // remember sub-cu (or sub-class file) java elements
- if (element instanceof IMember) {
- if (this.elements == null) {
- this.elements = new ArrayList();
- }
- this.elements.add(element);
- }
- this.add(this.fullPath(element), true);
-
- // find package fragment root including this java element
- IJavaElement parent = element.getParent();
- while (parent != null && !(parent instanceof IPackageFragmentRoot)) {
- parent = parent.getParent();
- }
- if (parent instanceof IPackageFragmentRoot) {
- root = (IPackageFragmentRoot) parent;
- }
- }
-
- if (root != null) {
- if (root.getKind() == IPackageFragmentRoot.K_BINARY) {
- this.addEnclosingProjectOrJar(root.getPath());
- } else {
- this.addEnclosingProjectOrJar(root.getJavaProject().getProject().getFullPath());
- }
- }
- }
-
- /**
- * Adds the given path to this search scope. Remember if subfolders need to
- * be included as well.
- */
- private void add(IPath path, boolean withSubFolders) {
- if (this.paths.length == this.pathsCount) {
- System.arraycopy(this.paths, 0, this.paths = new IPath[this.pathsCount * 2], 0, this.pathsCount);
- System.arraycopy(this.pathWithSubFolders, 0, this.pathWithSubFolders = new boolean[this.pathsCount * 2], 0, this.pathsCount);
- }
- this.paths[this.pathsCount] = path;
- this.pathWithSubFolders[this.pathsCount++] = withSubFolders;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IJavaSearchScope#encloses(String)
- */
- public boolean encloses(String resourcePathString) {
- IPath resourcePath;
- int separatorIndex = resourcePathString.indexOf(JAR_FILE_ENTRY_SEPARATOR);
- if (separatorIndex != -1) {
- resourcePath = new Path(resourcePathString.substring(0, separatorIndex)).append(new Path(resourcePathString.substring(separatorIndex + 1)));
- } else {
- resourcePath = new Path(resourcePathString);
- }
- return this.encloses(resourcePath);
- }
-
- /**
- * Returns whether this search scope encloses the given path.
- */
- private boolean encloses(IPath path) {
- for (int i = 0; i < this.pathsCount; i++) {
- if (this.pathWithSubFolders[i]) {
- if (this.paths[i].isPrefixOf(path)) {
- return true;
- }
- } else {
- IPath scopePath = this.paths[i];
- if (scopePath.isPrefixOf(path) && (scopePath.segmentCount() == path.segmentCount() - 1)) {
- return true;
- }
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IJavaSearchScope#encloses(IJavaElement)
- */
- public boolean encloses(IJavaElement element) {
- if (this.elements != null) {
- for (int i = 0, length = this.elements.size(); i < length; i++) {
- IJavaElement scopeElement = (IJavaElement) this.elements.get(i);
- IJavaElement searchedElement = element;
- while (searchedElement != null) {
- if (searchedElement.equals(scopeElement)) {
- return true;
- }
- searchedElement = searchedElement.getParent();
- }
- }
- return false;
- }
- return this.encloses(this.fullPath(element));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IJavaSearchScope#enclosingProjectsAndJars()
- */
- public IPath[] enclosingProjectsAndJars() {
- return this.enclosingProjectsAndJars;
- }
- private IPath fullPath(IJavaElement element) {
- if (element instanceof IPackageFragmentRoot) {
- return ((IPackageFragmentRoot) element).getPath();
- }
- IJavaElement parent = element.getParent();
- IPath parentPath = parent == null ? null : this.fullPath(parent);
- IPath childPath;
- if (element instanceof IPackageFragment) {
- childPath = new Path(element.getElementName().replace('.', '/'));
- } else if (element instanceof IOpenable) {
- childPath = new Path(element.getElementName());
- } else {
- return parentPath;
- }
- return parentPath == null ? childPath : parentPath.append(childPath);
- }
-
- protected void initialize() {
- this.paths = new IPath[1];
- this.pathWithSubFolders = new boolean[1];
- this.pathsCount = 0;
- this.enclosingProjectsAndJars = new IPath[0];
- }
- /**
- * Gets the includeExportedClassPathEntriesOnly.
- *
- * @return Returns a boolean
- */
- public boolean includeExportedClassPathEntriesOnly() {
- return includeExportedClassPathEntriesOnly;
- }
-
- /**
- * Sets the includeExportedClassPathEntriesOnly.
- *
- * @param includeExportedClassPathEntriesOnly
- * The includeExportedClassPathEntriesOnly to set
- */
- public void setIncludeExportedClassPathEntriesOnly(boolean includeExportedClassPathEntriesOnly) {
- this.includeExportedClassPathEntriesOnly = includeExportedClassPathEntriesOnly;
- }
- /**
- * @see IJavaSearchScope#includesBinaries()
- * @deprecated
- */
- public boolean includesBinaries() {
- return true;
- }
-
- /**
- * @see IJavaSearchScope#includesClasspaths()
- * @deprecated
- */
- public boolean includesClasspaths() {
- return true;
- }
-
- /**
- * @see IJavaSearchScope#setIncludesBinaries(boolean)
- * @deprecated
- */
- public void setIncludesBinaries(boolean includesBinaries) {
- //Default nothing
- }
-
- /**
- * @see IJavaSearchScope#setIncludesClasspaths(boolean)
- * @deprecated
- */
- public void setIncludesClasspaths(boolean includesClasspaths) {
- //Default nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java
deleted file mode 100644
index 353d443..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java
+++ /dev/null
@@ -1,65 +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.jst.j2ee.internal.dialogs;
-
-import java.util.HashSet;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-public class TypeSearchEngine extends SearchEngine {
-
- /**
- * Constructor for TypeSearchEngine.
- */
- public TypeSearchEngine() {
- super();
- }
-
- /**
- * Constructor for TypeSearchEngine.
- *
- * @param workingCopies
- */
- public TypeSearchEngine(ICompilationUnit[] workingCopies) {
- super(workingCopies);
- }
-
- /**
- * Method createJavaSearchScopeForAProject. Given a project it returns the
- * scope of the classes within the project's scope
- *
- * @param project
- * @param includeReferencedProjects
- * @param includeExportedClassPathEntriesOnly
- * @return IJavaSearchScope
- */
- public static IJavaSearchScope createJavaSearchScopeForAProject(IJavaProject project, boolean includeReferencedProjects, boolean includeExportedClassPathEntriesOnly) {
- if (!includeExportedClassPathEntriesOnly) {
- IJavaElement javaElements[] = new IJavaElement[]{project};
- return SearchEngine.createJavaSearchScope(javaElements, includeReferencedProjects);
- }
- TypeJavaSearchScope scope = new TypeJavaSearchScope();
- scope.setIncludeExportedClassPathEntriesOnly(true);
- HashSet visitedProjects = new HashSet(2);
- try {
- scope.addProject(project, includeReferencedProjects, visitedProjects);
- } catch (JavaModelException e) {
- // ignore
- }
- return scope;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java
deleted file mode 100644
index 7b42534..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java
+++ /dev/null
@@ -1,72 +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.jst.j2ee.internal.dialogs;
-
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.Viewer;
-
-public class TypedFileViewerFilter extends org.eclipse.jface.viewers.ViewerFilter {
- private String[] fAcceptedExtensions;
- private Hashtable visitedElements;
- public TypedFileViewerFilter(String[] acceptedExtensions) {
- fAcceptedExtensions = acceptedExtensions;
- visitedElements = new Hashtable();
- }
- public boolean isFilterProperty(Object element, Object property) {
- return false;
- }
- public boolean isValid(Object element) {
- if (IFile.class.isInstance(element))
- return isValidFile((IFile) element);
- if (IContainer.class.isInstance(element))
- return isValidContainer((IContainer) element);
- return false;
- }
- /*
- * A valid container is one that contains at least one valid member.
- */
- public boolean isValidContainer(IContainer container) {
- IResource[] members;
- Object valid = visitedElements.get(container);
- if (valid != null)
- return ((Boolean) valid).booleanValue();
- try {
- members = container.members();
- for (int i = 0; i < members.length; i++) {
- if (isValid(members[i])) {
- visitedElements.put(container, Boolean.TRUE);
- return true;
- }
- }
- } catch (CoreException e) {
- // Do nothing
- }
- visitedElements.put(container, Boolean.FALSE);
- return false;
- }
- public boolean isValidFile(IFile file) {
- String ext = file.getFileExtension();
- for (int i = 0; i < fAcceptedExtensions.length; i++) {
- if (fAcceptedExtensions[i].equalsIgnoreCase(ext)) {
- return true;
- }
- }
- return false;
- }
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- return isValid(element);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ArchiveEARUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ArchiveEARUIResourceHandler.java
deleted file mode 100644
index 1682ee1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ArchiveEARUIResourceHandler.java
+++ /dev/null
@@ -1,59 +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.jst.j2ee.internal.ear.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class ArchiveEARUIResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("archiveearui");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/EARImportListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/EARImportListContentProvider.java
deleted file mode 100644
index 31c2471..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/EARImportListContentProvider.java
+++ /dev/null
@@ -1,72 +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.jst.j2ee.internal.ear.actions;
-
-
-import org.eclipse.jst.j2ee.internal.wizard.TableObjects;
-
-/**
- * Insert the type's description here. Creation date: (5/7/2001 11:39:11 AM)
- *
- * @author: Administrator
- */
-public class EARImportListContentProvider implements org.eclipse.jface.viewers.IStructuredContentProvider {
- /**
- * EARImportListContentProvider constructor comment.
- */
- public EARImportListContentProvider() {
- super();
- }
-
- /**
- * Disposes of this content provider. This is called by the viewer when it is disposed.
- */
- public void dispose() {
- //dispose
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given element.
- * These elements can be presented as rows in a table, items in a list, etc. The result is not
- * modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- if (inputElement instanceof TableObjects)
- return ((TableObjects) inputElement).getTableObjects().toArray();
- return new Object[0]; //should throw exception instead
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a different
- * element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to changes on
- * the new input (using model-specific means), and deregistering the viewer from the old input.
- * In response to these change notifications, the content provider propagates the changes to the
- * viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not previously
- * have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have an input
- */
- public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ExportEARAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ExportEARAction.java
deleted file mode 100644
index a7078ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ExportEARAction.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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ear.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportEARAction extends BaseAction {
-
- public static String LABEL = J2EEUIPlugin.getDefault().getDescriptor().getResourceString("%ear.export.action.description_ui_");//$NON-NLS-1$
- private static final String ICON = "export_ear_wiz"; //$NON-NLS-1$
-
- public ExportEARAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public void primRun(Shell shell) {
- EARComponentExportWizard wizard = new EARComponentExportWizard();
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
- wizard.init(plugin.getWorkbench(), selection);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ImportEARAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ImportEARAction.java
deleted file mode 100644
index 305c3ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ImportEARAction.java
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ear.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportEARAction extends BaseAction {
- public static String LABEL = ArchiveEARUIResourceHandler.getString("Import_EAR"); //$NON-NLS-1$
- private static final String ICON = "import_ear_wiz"; //$NON-NLS-1$
-
- public ImportEARAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- protected void primRun(Shell shell) {
-
- EARComponentImportWizard wizard = new EARComponentImportWizard();
-
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
- wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java
deleted file mode 100644
index 4914e7f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java
+++ /dev/null
@@ -1,138 +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.jst.j2ee.internal.ear.actions;
-
-
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-
-/**
- * Insert the type's description here. Creation date: (8/22/2001 2:27:24 PM)
- *
- * @author: Administrator
- */
-public class ModulesProvider implements org.eclipse.jface.viewers.ILabelProvider, org.eclipse.jface.viewers.IStructuredContentProvider {
- /**
- * ModulesProvider constructor comment.
- */
- public ModulesProvider() {
- super();
- }
-
- /**
- * Adds a listener to this label provider. Has no effect if an identical listener is already
- * registered.
- * <p>
- * Label provider listeners are informed about state changes that affect the rendering of the
- * viewer that uses this label provider.
- * </p>
- *
- * @param listener
- * a label provider listener
- */
- public void addListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
- //do nothing
- }
-
- /**
- * Disposes of this content provider. This is called by the viewer when it is disposed.
- */
- public void dispose() {
- //dispose
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given element.
- * These elements can be presented as rows in a table, items in a list, etc. The result is not
- * modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(java.lang.Object inputElement) {
- return ((java.util.List) inputElement).toArray();
- }
-
- /**
- * Returns the image for the label of the given element. The image is owned by the label
- * provider and must not be disposed directly. Instead, dispose the label provider when no
- * longer needed.
- *
- * @param element
- * the element for which to provide the label image
- * @return the image used to label the element, or <code>null</code> if these is no image for
- * the given object
- */
- public org.eclipse.swt.graphics.Image getImage(Object element) {
- return null;
- }
-
- /**
- * Returns the text for the label of the given element.
- *
- * @param element
- * the element for which to provide the label text
- * @return the text string used to label the element, or <code>null</code> if these is no text
- * label for the given object
- */
- public String getText(Object element) {
- return ((ClassPathSelection) element).getText();
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a different
- * element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to changes on
- * the new input (using model-specific means), and deregistering the viewer from the old input.
- * In response to these change notifications, the content provider propagates the changes to the
- * viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not previously
- * have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have an input
- */
- public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /**
- * Returns whether the label would be affected by a change to the given property of the given
- * element. This can be used to optimize a non-structural viewer update. If the property
- * mentioned in the update does not affect the label, then the viewer need not update the label.
- *
- * @param element
- * the element
- * @param property
- * the property
- * @return <code>true</code> if the label would be affected, and <code>false</code> if it
- * would be unaffected
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /**
- * Removes a listener to this label provider. Has no affect if an identical listener is not
- * registered.
- *
- * @param listener
- * a label provider listener
- */
- public void removeListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
- //do nothing
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java
deleted file mode 100644
index 1eccf45..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java
+++ /dev/null
@@ -1,316 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EjbMethodElementComparator;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.common.frameworks.internal.ui.DisplayUtility;
-
-
-public abstract class AbstractMethodsContentProvider extends AdapterFactoryContentProvider {
- protected static EStructuralFeature ME_EJB_SF = EjbFactoryImpl.getPackage().getMethodElement_EnterpriseBean();
- protected static EStructuralFeature JAR_ASSEMBLY_SF = EjbFactoryImpl.getPackage().getEJBJar_AssemblyDescriptor();
- private static final EStructuralFeature ECORE_BEAN_NAME = EcorePackage.eINSTANCE.getENamedElement_Name(); //ENAMED_ELEMENT__NAME
- protected Comparator meComparator;
- protected boolean isRoot = true;
-
- public class EJBMethodItem {
- public EObject refObject;
- public EnterpriseBean ejb;
-
- public EJBMethodItem(EObject aRefObject, EnterpriseBean anEJB) {
- refObject = aRefObject;
- ejb = anEJB;
- }
-
- }
-
- /**
- * Constructor for AbstractMethodsContentProvider.
- *
- * @param adapterFactory
- */
- public AbstractMethodsContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public AbstractMethodsContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory);
- isRoot = root;
- }
-
- protected Comparator getEnterpriseBeanComparator() {
- return EJBNameComparator.singleton();
- }
-
- protected Comparator getMethodElementComparator() {
- if (meComparator == null)
- meComparator = new EjbMethodElementComparator();
- return meComparator;
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return getMethodElements((AbstractMethodsContentProvider.EJBMethodItem) parentElement);
- return new Object[0];
- }
-
- protected Object[] getMethodElements(AbstractMethodsContentProvider.EJBMethodItem ejbItem) {
- EObject refObject = ejbItem.refObject;
- if (refObject == null)
- return new Object[0];
- List elements = getMethodElements(refObject, ejbItem.ejb);
- Object[] result = elements.toArray();
- if (result.length == 1)
- return result;
- Arrays.sort(result, getMethodElementComparator());
- return result;
- }
-
- protected abstract List getMethodElements(EObject aRefObject, EnterpriseBean anEJB);
-
- protected Object[] getEnterpriseBeans(EObject parentElement, List someMethodElements) {
- if (someMethodElements.isEmpty())
- return new Object[0];
- Set ejbs = new HashSet();
- EnterpriseBean ejb = null;
- MethodElement me = null;
- for (int i = 0; i < someMethodElements.size(); i++) {
- me = (MethodElement) someMethodElements.get(i);
- ejb = me.getEnterpriseBean();
- if (ejb != null)
- ejbs.add(ejb);
- }
- Object[] result = ejbs.toArray();
- if (result.length != 1)
- Arrays.sort(result, getEnterpriseBeanComparator());
- ejb = null;
- for (int i = 0; i < result.length; i++) {
- ejb = (EnterpriseBean) result[i];
- result[i] = new EJBMethodItem(parentElement, ejb);
- }
- return result;
- }
-
- protected AssemblyDescriptor getAssemblyDescriptor(EnterpriseBean ejb) {
- if (ejb == null)
- return null;
- return ejb.getEjbJar().getAssemblyDescriptor();
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- if (element instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return true;
- return false;
- }
-
- protected TreeViewer getTreeViewer() {
- return (TreeViewer) viewer;
- }
-
- protected void refreshTreeViewer(Object obj) {
- if (viewer != null)
- DisplayUtility.asyncExec(createRefreshTreeRunnable(obj));
- }
-
- protected void refreshTreeViewer() {
- if (viewer != null)
- DisplayUtility.asyncExec(createRefreshTreeRunnable(null));
- }
-
- protected void refreshTreeViewer(MethodElement me) {
- refreshTreeViewer(me.eContainer());
- }
-
- protected void refreshTreeViewer(List aList) {
- if (aList.isEmpty())
- return;
- refreshTreeViewer((MethodElement) aList.get(0));
- }
-
- protected void addToTreeViewer(final MethodElement me) {
- if (viewer == null)
- return;
- DisplayUtility.asyncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- // findMethodItem() should be run in a Display thread
- EJBMethodItem item = findMethodItem(me);
- if (item != null)
- DisplayUtility.asyncExec(createAddItemTreeRunnable(item, me));
- else
- refreshTreeViewer(me.eContainer());
-
- }
- });
- }
-
- protected void removeFromTreeViewer(final EObject parent, final MethodElement me) {
- if (viewer == null)
- return;
- DisplayUtility.asyncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- EnterpriseBean ejb = me.getEnterpriseBean();
- EJBMethodItem item = findMethodItem(ejb, parent);
- if (item != null)
- refreshTreeViewer(item);
- else
- refreshTreeViewer((Object) null);
- }
- });
- }
-
- protected EJBMethodItem findMethodItem(MethodElement me) {
- return findMethodItem(me.getEnterpriseBean(), me.eContainer());
- }
-
- protected EJBMethodItem findMethodItem(EnterpriseBean ejb, EObject parentMethod) {
- TreeItem[] items = getTreeViewer().getTree().getItems();
- return findMethodItem(ejb, parentMethod, items);
- }
-
- protected EJBMethodItem findMethodItem(EnterpriseBean ejb, EObject parentMethod, TreeItem[] items) {
- TreeItem item = null;
- Object data = null;
- EJBMethodItem methodItem = null, found = null;
- for (int i = 0; i < items.length; i++) {
- item = items[i];
- data = item.getData();
- if (data instanceof EJBMethodItem) {
- methodItem = (EJBMethodItem) data;
- if (methodItem.ejb == ejb && methodItem.refObject == parentMethod)
- return methodItem;
- }
- found = findMethodItem(ejb, parentMethod, item.getItems());
- if (found != null)
- return found;
- }
- return null;
- }
-
- /*
- * @see INotifyChangedListener#notifyChanged(new ENotificationImpl((InternalEObject)Object,
- * int,(EStructuralFeature) Object, Object, Object, int))
- */
- public void notifyChanged(Notification notifier) {
- if (notifier.getEventType() == Notification.RESOLVE)
- return;
- else if (notifier.getOldValue() instanceof CMPAttribute && notifier.getNewValue() == null)
- return;
- else if (notifier.getFeature() == ME_EJB_SF) {
- refreshTreeViewer((MethodElement) notifier.getNotifier());
- return;
- } else if (notifier.getFeature() == ECORE_BEAN_NAME) {
- refreshTreeViewer();
- return;
- } else if (getMethodElementsReference() == notifier.getFeature()) {
- if (notifier.getEventType() == Notification.ADD)
- addToTreeViewer((MethodElement) notifier.getNewValue());
- else if (notifier.getEventType() == Notification.REMOVE)
- removeFromTreeViewer((EObject) notifier.getNotifier(), (MethodElement) notifier.getOldValue());
- return;
- } else if (notifier.getFeature() == JAR_ASSEMBLY_SF && isRoot) {
- updateTreeInput(notifier.getNewValue());
- } else if (notifier.getFeature() == getMethodElementsContainerReference())
- super.notifyChanged(notifier);
- }
-
- /**
- * @param notifier
- */
- protected void updateTreeInput(final Object target) {
- DisplayUtility.asyncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
-
- getTreeViewer().setInput(target); //reset the input
- getTreeViewer().refresh(target);
-
- }
- });
- }
-
- private Runnable createAddItemTreeRunnable(final Object parent, final MethodElement me) {
- return new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- getTreeViewer().add(parent, me);
- }
- };
- }
-
- private Runnable createRefreshTreeRunnable(final Object target) {
- return new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- if (target != null)
- getTreeViewer().refresh(target);
- else
- getTreeViewer().refresh();
- }
- };
- }
-
- protected abstract EStructuralFeature getMethodElementsReference();
-
- protected abstract EStructuralFeature getMethodElementsContainerReference();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java
deleted file mode 100644
index 38a42eb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java
+++ /dev/null
@@ -1,57 +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.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:29:49 AM)
- *
- * @author: Administrator
- */
-public class BeanClassProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * BeanClassProviderHelper constructor comment.
- */
- public BeanClassProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:53:09 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- public JavaClass getJavaClass() {
- return getEjb().getEjbClass();
- }
-
- protected String getOverlayKey() {
- return "ejb_module_ovr";//$NON-NLS-1$
- }
-
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("EJB_Class_UI_", new Object[]{className}); //$NON-NLS-1$ = "EJB Class"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java
deleted file mode 100644
index d03ed28..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java
+++ /dev/null
@@ -1,31 +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.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class EJBUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "j2ee_ejb_ui";//$NON-NLS-1$
-
- private EJBUIMessages() {
- // Do not instantiate
- }
-
- public static String GroupedEJBJarItemProvider_UI_0;
- public static String GroupedEJBJarItemProvider_UI_1;
- public static String GroupedEJBJarItemProvider_UI_2;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBUIMessages.class);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java
deleted file mode 100644
index 12c91ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java
+++ /dev/null
@@ -1,140 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class ExcludeListContentProvider extends AbstractMethodsContentProvider {
- private static final EStructuralFeature EXCLUDE_ME_SF = EjbFactoryImpl.getPackage().getExcludeList_MethodElements();
- private static final EStructuralFeature AD_EL_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_ExcludeList();
- protected static final EStructuralFeature ECORE_BEAN_NAME = EcorePackage.eINSTANCE.getENamedElement_Name(); //ENAMED_ELEMENT__NAME
-
- /**
- * Constructor for ExcludeListContentProvider.
- *
- * @param adapterFactory
- * @param root
- * @param viewer
- */
- public ExcludeListContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory, root);
- }
-
- /**
- * Constructor for ExcludesListContentProvider.
- *
- * @param adapterFactory
- */
- public ExcludeListContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- protected Object[] getEnterpriseBeans(ExcludeList list) {
- List mes = list.getMethodElements();
- return getEnterpriseBeans(list, mes);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
- */
- protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
- if (!(aRefObject instanceof ExcludeList))
- return Collections.EMPTY_LIST;
- ExcludeList parentList = (ExcludeList) aRefObject;
- if (parentList == null)
- return Collections.EMPTY_LIST;
- return parentList.getMethodElements(anEJB);
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object inputElement) {
- super.getElements(inputElement);
- ExcludeList list = null;
- if (inputElement instanceof EJBJar) {
- EJBJar jar = (EJBJar) inputElement;
- if (jar.getAssemblyDescriptor() != null)
- list = jar.getAssemblyDescriptor().getExcludeList();
- if (list != null)
- return getEnterpriseBeans(list);
- }
- if (inputElement instanceof AssemblyDescriptor) {
- list = ((AssemblyDescriptor) inputElement).getExcludeList();
- if (list != null)
- return getEnterpriseBeans(list);
- }
- return new Object[0];
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof ExcludeList)
- return getEnterpriseBeans((ExcludeList) parentElement);
- return super.getChildren(parentElement);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- if (element instanceof ExcludeList)
- return !((ExcludeList) element).getMethodElements().isEmpty();
- return super.hasChildren(element);
- }
-
- public void notifyChanged(Notification notifier) {
- if ((notifier.getFeature() == EXCLUDE_ME_SF && notifier.getNotifier() instanceof ExcludeList) || notifier.getFeature() == ECORE_BEAN_NAME) {
- if (notifier.getEventType() == Notification.RESOLVE)
- return;
- if (isRoot)
- refreshTreeViewer();
- else
- refreshTreeViewer(notifier.getNotifier());
- }
- if (notifier.getOldValue() instanceof CMPAttribute && notifier.getNewValue() == null)
- return;
- if (notifier.getFeature() == getMethodElementsReference() || notifier.getFeature() == getMethodElementsContainerReference())
- super.notifyChanged(notifier);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElementsReference()
- */
- protected EStructuralFeature getMethodElementsReference() {
- return EXCLUDE_ME_SF;
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
- */
- protected EStructuralFeature getMethodElementsContainerReference() {
- return AD_EL_SF;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java
deleted file mode 100644
index b659390..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java
+++ /dev/null
@@ -1,30 +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.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-
-
-
-/**
- * This class is the item provider for EJB groups
- */
-public abstract class GroupedEJBItemProvider extends J2EEItemProvider {
-
- public GroupedEJBItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- public abstract String getText(Object object);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java
deleted file mode 100644
index d0e7ce2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java
+++ /dev/null
@@ -1,376 +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.jst.j2ee.internal.ejb.provider;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationWrapper;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-
-
-/**
- * @author Sachin P Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedEJBJarItemProvider extends EJBJarItemProvider {
-
- private GroupedSessionItemProvider sessionProvider = null;
- private GroupedEntityItemProvider entityProvider = null;
- private GroupedMessageItemProvider messageProvider = null;
-
- private static Hashtable sessionTable = new Hashtable();
- private static Hashtable entityTable = new Hashtable();
- private static Hashtable messageTable = new Hashtable();
-
- private static final String SESSION = EJBUIMessages.GroupedEJBJarItemProvider_UI_0;
- private static final String ENTITY = EJBUIMessages.GroupedEJBJarItemProvider_UI_1;
- private static final String MESSAGE = EJBUIMessages.GroupedEJBJarItemProvider_UI_2;
-
- // Normally there is one instance of an item provider for all instances of the objecct
- // in the tree. The item provider would be stateless. However, because we are doing tricks
- // here, we are keeping track of all items this provider manages. The key in the map is the
- // object (EJBJar), and the value is the children nodes that we inserted
-
- protected Map children = new HashMap();
- private boolean showAssemblyDescriptor;
- private boolean isDisposing;
-
- public GroupedEJBJarItemProvider(AdapterFactory adapterFactory, boolean showAssemblyDescriptor) {
- super(adapterFactory);
- this.showAssemblyDescriptor = showAssemblyDescriptor;
- }
-
- public Collection getChildren(Object object) {
- List result = initChildren(object);
- if (showAssemblyDescriptor) {
- if (((EJBJar) object).getAssemblyDescriptor() != null)
- result.add(((EJBJar) object).getAssemblyDescriptor());
- }
- return result;
- }
-
- protected List initChildren(Object object) {
- EJBJar ejbJar = (EJBJar) object;
- List allRootBeans = getAllRootBeans(ejbJar);
-
- boolean is20Jar = is20Jar(ejbJar);
-
- List localChildren = new ArrayList(5);
-
- List entityBeans = new ArrayList();
- List sessionBeans = new ArrayList();
- List messageBeans = new ArrayList();
-
- catagorizeBeans(allRootBeans, entityBeans, sessionBeans, messageBeans);
- orderBeans(entityBeans);
- orderBeans(sessionBeans);
- orderBeans(messageBeans);
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //if (sessionBeans.size() > 0) {
- if (sessionTable.get(ejbJar) == null) {
- //create new item provider instance
- sessionProvider = new GroupedSessionItemProvider(adapterFactory, null, getImage(SESSION), object, sessionBeans);
- sessionTable.put(ejbJar, sessionProvider);
- localChildren.add(sessionProvider);
- } else {
- //use existing instance from table
- localChildren.add(sessionTable.get(ejbJar));
- }
- //}
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //if (entityBeans.size() > 0) {
- if (entityTable.get(ejbJar) == null) {
- //create new item provider instance
- entityProvider = new GroupedEntityItemProvider(adapterFactory, null, getImage(ENTITY), object, entityBeans);
- entityTable.put(ejbJar, entityProvider);
- localChildren.add(entityProvider);
- } else {
- //use existing instance from table
- localChildren.add(entityTable.get(ejbJar));
- }
- //}
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //if (is20Jar && messageBeans.size() > 0) {
- if (is20Jar) {
- if (messageTable.get(ejbJar) == null) {
- //create new item provider instance
- messageProvider = new GroupedMessageItemProvider(adapterFactory, null, getImage(MESSAGE), object, messageBeans);
- messageTable.put(ejbJar, messageProvider);
- localChildren.add(messageProvider);
- } else {
- //use existing instance from table
- localChildren.add(messageTable.get(ejbJar));
- }
- }
- //}
-
- children.put(object, localChildren);
-
- return localChildren;
- }
-
- protected void orderBeans(List beans) {
- Object[] beansArray = beans.toArray();
- Arrays.sort(beansArray, EJBNameComparator.singleton());
- beans.clear();
- beans.addAll(Arrays.asList(beansArray));
- }
-
- protected static List getAllRootBeans(EJBJar ejbJar) {
- return ejbJar.getEnterpriseBeans();
- }
-
- protected void catagorizeBeans(List allRootBeans, List entityBeans, List sessionBeans, List messageBeans) {
- for (int i = 0; i < allRootBeans.size(); i++) {
- if (((EnterpriseBean) allRootBeans.get(i)).isSession()) {
- sessionBeans.add(allRootBeans.get(i));
- } else if (((EnterpriseBean) allRootBeans.get(i)).isEntity()) {
- entityBeans.add(allRootBeans.get(i));
- } else if (((EnterpriseBean) allRootBeans.get(i)).isMessageDriven()) {
- messageBeans.add(allRootBeans.get(i));
- }
- }
- }
-
- static protected GroupedSessionItemProvider getSessionNode(Object object) {
- return (GroupedSessionItemProvider) sessionTable.get(object);
- }
-
- static protected GroupedEntityItemProvider getEntityNode(Object object) {
- return (GroupedEntityItemProvider) entityTable.get(object);
- }
-
- static protected GroupedMessageItemProvider getMessageNode(Object object) {
- return (GroupedMessageItemProvider) messageTable.get(object);
- }
-
- public Object getImage(String type) {
- if (type.equals(SESSION))
- return J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
- else if (type.equals(MESSAGE))
- return J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
- else if (type.equals(ENTITY))
- return J2EEPlugin.getPlugin().getImage("entitybean_obj"); //$NON-NLS-1$
- else
- return null;
- }
-
- private boolean is20Jar(EJBJar ejbJar) {
- switch (ejbJar.getVersionID()) {
- case J2EEVersionConstants.EJB_1_0_ID :
- case J2EEVersionConstants.EJB_1_1_ID :
- return false;
- case J2EEVersionConstants.EJB_2_0_ID :
- case J2EEVersionConstants.EJB_2_1_ID :
- default :
- return true;
- }
- }
-
- public void notifyChanged(Notification notification) {
- if (notification.getEventType() == Notification.REMOVING_ADAPTER && notification.getOldValue() == this && !isDisposing) {
- removeTarget(notification);
- return;
- }
- if (notification.getFeature() == EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans()) {
- J2EEItemProvider provider = beansChanged((EJBJar) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
-
- //EJB's group has not been added yet, need to add group to tree before EJB can be added
- if (provider == null) {
- Notification msg = new NotificationImpl(Notification.ADD, null, getEJBItemProvider((EnterpriseBean) notification.getNewValue()), 1);
- NotificationWrapper notificationWrapper = new NotificationWrapper(notification.getNotifier(), msg);
- fireNotifyChanged(notificationWrapper);
- provider = beansChanged((EJBJar) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
- }
-
- //Fire notification for EJB add or remove
- NotificationWrapper notificationWrapper = new NotificationWrapper(provider, notification);
- fireNotifyChanged(notificationWrapper);
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //If Group is empty remove the group
- /*
- * if (provider != null && provider.getChildren().size() == 0) { Notification msg = new
- * NotificationImpl(Notification.REMOVE, provider, null, 1); notificationWrapper = new
- * NotificationWrapper(notification.getNotifier(), msg);
- * fireNotifyChanged(notificationWrapper);
- *
- * //Group is removed so flush out table entry if (provider instanceof
- * GroupedSessionItemProvider) { sessionTable.remove(notification.getNotifier());
- * provider = null; } else if (provider instanceof GroupedEntityItemProvider) {
- * entityTable.remove(notification.getNotifier()); provider = null; } else if (provider
- * instanceof GroupedMessageItemProvider) {
- * messageTable.remove(notification.getNotifier()); provider = null; }
- *
- * //If all groups are removed remove the extended children List allChildren = new
- * ArrayList(this.getChildren((EJBJar) notification.getNotifier()));
- * if(sessionTable.get(notification.getNotifier()) == null &&
- * entityTable.get(notification.getNotifier()) == null &&
- * messageTable.get(notification.getNotifier()) == null) { for(int i = 0; i <
- * allChildren.size(); i++) { Notification message = new
- * NotificationImpl(Notification.REMOVE, allChildren.get(i), null, 1);
- * notificationWrapper = new NotificationWrapper(notification.getNotifier(), message);
- * fireNotifyChanged(notificationWrapper); } this.getChildren((EJBJar)
- * notification.getNotifier()).clear(); } }
- */
- } else {
- super.notifyChanged(notification);
- }
- }
-
- protected J2EEItemProvider beansChanged(EJBJar ejbJar, int eventType, Object oldValue, Object newValue, int pos) {
- J2EEItemProvider provider = getItemProvider(ejbJar, oldValue, newValue);
-
- if (provider != null) {
- Collection grandChildren = provider.getChildren();
-
- switch (eventType) {
- case Notification.ADD : {
- if (!grandChildren.contains(newValue))
- grandChildren.add(newValue);
-
- break;
- }
- case Notification.ADD_MANY : {
- grandChildren.addAll((Collection) newValue);
- break;
- }
- case Notification.REMOVE : {
- grandChildren.remove(oldValue);
- break;
- }
- case Notification.REMOVE_MANY : {
- grandChildren.removeAll((Collection) oldValue);
- break;
- }
- }
- } else {
- //GroupedProvider for new bean does not exist, create one.
- List allRootBeans = getAllRootBeans(ejbJar);
-
- List entityBeans = new ArrayList();
- List sessionBeans = new ArrayList();
- List messageBeans = new ArrayList();
-
- catagorizeBeans(allRootBeans, entityBeans, sessionBeans, messageBeans);
-
- if (newValue instanceof Session) {
- sessionProvider = new GroupedSessionItemProvider(adapterFactory, null, getImage(SESSION), ejbJar, sessionBeans);
- sessionTable.put(ejbJar, sessionProvider);
- } else if (newValue instanceof Entity) {
- entityProvider = new GroupedEntityItemProvider(adapterFactory, null, getImage(ENTITY), ejbJar, entityBeans);
- entityTable.put(ejbJar, entityProvider);
- } else if (newValue instanceof MessageDriven) {
- messageProvider = new GroupedMessageItemProvider(adapterFactory, null, getImage(MESSAGE), ejbJar, messageBeans);
- messageTable.put(ejbJar, messageProvider);
- }
- }
- return provider;
- }
-
- static public J2EEItemProvider getEJBJarItemProvider(EJBJar ejbJar, Object bean) {
- J2EEItemProvider provider = null;
- if (ejbJar != null && bean != null) {
- if (bean instanceof Session) {
- provider = getSessionNode(ejbJar);
- } else if (bean instanceof Entity) {
- provider = getEntityNode(ejbJar);
- } else if (bean instanceof MessageDriven) {
- provider = getMessageNode(ejbJar);
- }
- }
- return provider;
- }
-
- static public J2EEItemProvider getEJBItemProvider(EnterpriseBean bean) {
- if (bean != null) {
- EJBJar ejbJar = bean.getEjbJar();
- return getEJBJarItemProvider(ejbJar, bean);
- }
- return null;
- }
-
- protected J2EEItemProvider getItemProvider(EJBJar ejbJar, Object oldValue, Object newValue) {
- if (newValue != null)
- return getEJBJarItemProvider(ejbJar, newValue);
- else if (oldValue != null)
- return getEJBJarItemProvider(ejbJar, oldValue);
- else
- return null;
- }
-
- public static boolean isRootBean(EnterpriseBean bean) {
- List allRootBeans = getAllRootBeans(bean.getEjbJar());
- if (allRootBeans != null && allRootBeans.contains(bean)) {
- return true;
- }
- return false;
- }
-
- // Utility method for garbage collection - if EJBJar removed, remove
- // all entires in table for EJBJar
- static public void flushOutTableEntriesForEJBJar(EJBJar ejbJar) {
- sessionTable.remove(ejbJar);
- entityTable.remove(ejbJar);
- messageTable.remove(ejbJar);
- }
-
- public boolean hasChildren(Object parent) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.provider.EJBJarItemProvider#removeTarget(org.eclipse.emf.common.notify.Notification)
- */
- protected void removeTarget(Notification not) {
- if (not.getNotifier() instanceof EJBJar)
- flushOutTableEntriesForEJBJar((EJBJar) not.getNotifier());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#dispose()
- */
- public void dispose() {
- try {
- isDisposing = true;
- super.dispose();
- } finally {
- isDisposing = false;
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java
deleted file mode 100644
index 0dbb40b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java
+++ /dev/null
@@ -1,37 +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.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-/**
- * @author Sachin Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedEntityItemProvider extends GroupedEJBItemProvider {
-
- public static final String ENTITY = J2EEUIMessages.getResourceString("Entity_UI_"); //$NON-NLS-1$
-
- public GroupedEntityItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- public String getText(Object object) {
- return ENTITY;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java
deleted file mode 100644
index 6c977b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java
+++ /dev/null
@@ -1,38 +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.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-
-/**
- * @author Sachin Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedMessageItemProvider extends GroupedEJBItemProvider {
-
- public static final String MESSAGE_BEANS = J2EEUIMessages.getResourceString("Message_Driven_Beans_UI_"); //$NON-NLS-1$
-
- public GroupedMessageItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- public String getText(Object object) {
- return MESSAGE_BEANS;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java
deleted file mode 100644
index 15c2817..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java
+++ /dev/null
@@ -1,37 +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.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-/**
- * @author Sachin Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedSessionItemProvider extends GroupedEJBItemProvider {
-
- public static final String SESSION_BEANS = J2EEUIMessages.getResourceString("Session_Beans_UI_"); //$NON-NLS-1$
-
- public GroupedSessionItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- public String getText(Object object) {
- return SESSION_BEANS;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java
deleted file mode 100644
index 6c37abe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java
+++ /dev/null
@@ -1,60 +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.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:23:30 PM)
- *
- * @author: Administrator
- */
-public class HomeInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * HomeInterfaceProviderHelper constructor comment.
- *
- * @param cls
- * org.eclipse.jem.internal.java.JavaClass
- */
- public HomeInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:53:49 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- public JavaClass getJavaClass() {
- return getEjb().getHomeInterface();
- }
-
- protected String getOverlayKey() {
- return "home_interface_overlay_obj";//$NON-NLS-1$
- }
-
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Home_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Home Interface"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java
deleted file mode 100644
index ec5f13c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java
+++ /dev/null
@@ -1,46 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 6:58:51 PM)
- *
- * @author: Administrator
- */
-public class J2EEContainerManagedEntityItemProvider extends ContainerManagedEntityItemProvider {
- /**
- * J2EEContainerManagedEntityItemProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EEContainerManagedEntityItemProvider(EjbItemProviderAdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildren(object));
- J2EEJavaClassProviderHelper.addChildren((ContainerManagedEntity) object, result);
- result.addAll(((ContainerManagedEntity) object).getEnvironmentProperties());
- result.addAll(J2EEReferenceProviderHelper.getReferences((EnterpriseBean) object));
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
deleted file mode 100644
index f888d86..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,80 +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.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 7:20:07 PM)
- *
- * @author: Administrator
- */
-public class J2EEEjbItemProviderAdapterFactory extends org.eclipse.jst.j2ee.internal.ejb.provider.EjbItemProviderAdapterFactory {
- /**
- * J2EEEjbItemProviderAdapterFactory constructor comment.
- */
- public J2EEEjbItemProviderAdapterFactory() {
- super();
- }
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}.
- */
- public Adapter createContainerManagedEntityAdapter() {
- if (containerManagedEntityItemProvider == null) {
- containerManagedEntityItemProvider = new J2EEContainerManagedEntityItemProvider(this);
- }
-
- return containerManagedEntityItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar}.
- */
- public Adapter createEJBJarAdapter() {
- if (eJBJarItemProvider == null) {
- eJBJarItemProvider = new GroupedEJBJarItemProvider(this, true);
- }
-
- return eJBJarItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Entity}.
- */
- public Adapter createEntityAdapter() {
- if (entityItemProvider == null) {
- entityItemProvider = new J2EEEntityItemProvider(this);
- }
-
- return entityItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Session}.
- */
- public Adapter createSessionAdapter() {
- if (sessionItemProvider == null) {
- sessionItemProvider = new J2EESessionItemProvider(this);
- }
-
- return sessionItemProvider;
- }
-
- public Adapter createMessageDrivenAdapter() {
- if (messageDrivenItemProvider == null) {
- messageDrivenItemProvider = new J2EEMessageDrivenItemProvider(this);
- }
- return messageDrivenItemProvider;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java
deleted file mode 100644
index 037d4d6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java
+++ /dev/null
@@ -1,43 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.Entity;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:10:06 PM)
- *
- * @author: Administrator
- */
-public class J2EEEntityItemProvider extends EntityItemProvider {
- /**
- * J2EEEntityItemProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EEEntityItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildrenSuper(object));
- J2EEJavaClassProviderHelper.addChildren((Entity) object, result);
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java
deleted file mode 100644
index 5660abf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java
+++ /dev/null
@@ -1,143 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.OverlayIcon;
-
-public abstract class J2EEJavaClassProviderHelper implements IAdaptable {
- private EnterpriseBean ejb;
- public static final Class IRESOURCE_CLASS = IResource.class;
-
- /**
- * J2EEJavaClassProviderHelper constructor comment.
- */
- public J2EEJavaClassProviderHelper(EnterpriseBean anEJB) {
- super();
- setEjb(anEJB);
- }
-
- public static void addChildren(Entity ejb, Collection children) {
- addChildren((EnterpriseBean) ejb, children);
- if (ejb.getPrimaryKey() != null)
- children.add(new PrimaryKeyClassProviderHelper(ejb));
- }
-
- public static void addChildren(EnterpriseBean ejb, Collection children) {
-
- if (ejb.getHomeInterface() != null)
- children.add(new HomeInterfaceProviderHelper(ejb));
- if (ejb.getRemoteInterface() != null)
- children.add(new RemoteInterfaceProviderHelper(ejb));
- if (ejb.getLocalHomeInterface() != null)
- children.add(new LocalHomeInterfaceProviderHelper(ejb));
- if (ejb.getLocalInterface() != null)
- children.add(new LocalInterfaceProviderHelper(ejb));
- if (ejb.getEjbClass() != null)
- children.add(new BeanClassProviderHelper(ejb));
- }
-
- protected Image createImage() {
- ImageDescriptor base = J2EEUIPlugin.getDefault().getImageDescriptor("jcu_obj");//$NON-NLS-1$
- if (base == null)
- return null;
- ImageDescriptor overlay = getOverlayDescriptor();
- if (overlay == null)
- return base.createImage();
- return new OverlayIcon(base, new ImageDescriptor[][]{{overlay}}).createImage();
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:47:24 PM)
- *
- * @return org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean
- */
- public org.eclipse.jst.j2ee.ejb.EnterpriseBean getEjb() {
- return ejb;
- }
-
- public Image getImage() {
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/20/2001 10:30:54 PM)
- *
- * @return JavaClass
- */
- public abstract JavaClass getJavaClass();
-
- protected ImageDescriptor getOverlayDescriptor() {
- return J2EEUIPlugin.getDefault().getImageDescriptor(getOverlayKey());
- }
-
- protected abstract String getOverlayKey();
-
- protected IProject getProject() {
- return ProjectUtilities.getProject(getJavaClass());
- }
-
- public String getStatusLineMessage() {
- if (getJavaClass() != null)
- return getTypeString(getJavaClass().getQualifiedName());
- return ""; //$NON-NLS-1$
- }
-
- public String getText() {
- if (getJavaClass() != null)
- return getJavaClass().getName();
- return ""; //$NON-NLS-1$
- }
-
- public abstract String getTypeString(String className);
-
- public void openInEditor() {
- IProject project = ProjectUtilities.getProject(getJavaClass());
- try {
- J2EEEditorUtility.openInEditor(getJavaClass(), project);
- } catch (Exception cantOpen) {
- //Ignore
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:47:24 PM)
- *
- * @param newEjb
- * org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean
- */
- public void setEjb(org.eclipse.jst.j2ee.ejb.EnterpriseBean newEjb) {
- ejb = newEjb;
- }
-
- /**
- * @see IAdaptable#EcoreUtil.getAdapter(eAdapters(),Class)
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IRESOURCE_CLASS)
- return J2EEEditorUtility.getFile(getJavaClass());
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java
deleted file mode 100644
index a015586..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java
+++ /dev/null
@@ -1,40 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class J2EEMessageDrivenItemProvider extends MessageDrivenItemProvider {
-
- public J2EEMessageDrivenItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildrenSuper(object));
- J2EEJavaClassProviderHelper.addChildren((MessageDriven) object, result);
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java
deleted file mode 100644
index b8b8948..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java
+++ /dev/null
@@ -1,49 +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
- *******************************************************************************/
-/*
- * Created on May 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class J2EEReferenceProviderHelper {
-
- public static Collection getReferences(EnterpriseBean bean) {
- List result = new ArrayList();
- if (!bean.getEjbRefs().isEmpty())
- result.addAll(bean.getEjbRefs());
- if (!bean.getEjbLocalRefs().isEmpty())
- result.addAll(bean.getEjbLocalRefs());
- if (!bean.getResourceRefs().isEmpty())
- result.addAll(bean.getResourceRefs());
- if (!bean.getSecurityRoleRefs().isEmpty())
- result.addAll(bean.getSecurityRoleRefs());
- if (!bean.getResourceEnvRefs().isEmpty())
- result.addAll(bean.getResourceEnvRefs());
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java
deleted file mode 100644
index d64d275..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:10:48 PM)
- *
- * @author: Administrator
- */
-public class J2EESessionItemProvider extends org.eclipse.jst.j2ee.internal.ejb.provider.SessionItemProvider {
- /**
- * J2EESessionItemProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EESessionItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildrenSuper(object));
- addServiceEndpointInterface((Session) object, result);
- J2EEJavaClassProviderHelper.addChildren((Session) object, result);
- return result;
- }
-
- /**
- * @param session
- * @param result
- */
- private void addServiceEndpointInterface(Session session, Collection children) {
- if (session.getVersionID() >= J2EEVersionConstants.EJB_2_1_ID && session.getServiceEndpoint() != null)
- children.add(new ServiceEndpointInterfaceProviderHelper(session));
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java
deleted file mode 100644
index cfea51a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java
+++ /dev/null
@@ -1,58 +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.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-public class LocalHomeInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-
- private static Image image;
-
- /**
- * Constructor for LocalHomeInterfaceProviderHelper.
- *
- * @param anEJB
- */
- public LocalHomeInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getJavaClass()
- */
- public JavaClass getJavaClass() {
- return getEjb().getLocalHomeInterface();
- }
-
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getOverlayKey()
- */
- protected String getOverlayKey() {
- return "local_home_interface_overlay_obj"; //$NON-NLS-1$
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getTypeString(String)
- */
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Local_Home_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Local Home Interface";
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java
deleted file mode 100644
index 9a9af2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java
+++ /dev/null
@@ -1,58 +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.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-public class LocalInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-
- private static Image image;
-
- /**
- * Constructor for LocalInterfaceProviderHelper.
- *
- * @param anEJB
- */
- public LocalInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getJavaClass()
- */
- public JavaClass getJavaClass() {
- return getEjb().getLocalInterface();
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getOverlayKey()
- */
- protected String getOverlayKey() {
- return "local_interface_overlay_obj";//$NON-NLS-1$
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getTypeString(String)
- */
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Local_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Local Interface"
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java
deleted file mode 100644
index e2109e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java
+++ /dev/null
@@ -1,129 +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.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class MethodPermissionsContentProvider extends AbstractMethodsContentProvider {
- private static final EStructuralFeature PERMISSION_MES_SF = EjbFactoryImpl.getPackage().getMethodPermission_MethodElements();
- private static final EStructuralFeature PERMISSION_MES_UNCHECKED_SF = EjbFactoryImpl.getPackage().getMethodPermission_Unchecked();
- private static final EStructuralFeature PERMISSION_MES_ROLES_SF = EjbFactoryImpl.getPackage().getMethodPermission_Roles();
- private static final EStructuralFeature AD_MP_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_MethodPermissions();
-
- /**
- * Constructor for MethodPermissionsContentProvider.
- *
- * @param adapterFactory
- * @param root
- * @param viewer
- */
- public MethodPermissionsContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory, root);
- }
-
- /**
- * Constructor for MethodPermissionsContentProvider.
- *
- * @param adapterFactory
- */
- public MethodPermissionsContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof MethodPermission)
- return getEnterpriseBeans((MethodPermission) parentElement);
- return super.getChildren(parentElement);
- }
-
- protected Object[] getEnterpriseBeans(MethodPermission mp) {
- List mes = mp.getMethodElements();
- return getEnterpriseBeans(mp, mes);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
- */
- protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
- if (!(aRefObject instanceof MethodPermission))
- return Collections.EMPTY_LIST;
- MethodPermission parentMP = (MethodPermission) aRefObject;
- if (parentMP == null)
- return Collections.EMPTY_LIST;
- return parentMP.getMethodElements(anEJB);
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object inputElement) {
- super.getElements(inputElement);
- if (inputElement instanceof EJBJar) {
- EJBJar jar = (EJBJar) inputElement;
- if (jar.getAssemblyDescriptor() != null)
- return jar.getAssemblyDescriptor().getMethodPermissions().toArray();
- }
- if (inputElement instanceof AssemblyDescriptor)
- return ((AssemblyDescriptor) inputElement).getMethodPermissions().toArray();
- return new Object[0];
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- if (element instanceof MethodPermission)
- return !((MethodPermission) element).getMethodElements().isEmpty();
- return super.hasChildren(element);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElementsReference()
- */
- protected EStructuralFeature getMethodElementsReference() {
- return PERMISSION_MES_SF;
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
- */
- protected EStructuralFeature getMethodElementsContainerReference() {
- return AD_MP_SF;
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.INotifyChangedListener#notifyChanged(Notification)
- */
- public void notifyChanged(Notification notification) {
- if (notification.getFeature() == PERMISSION_MES_SF || notification.getFeature() == AD_MP_SF)
- refreshTreeViewer();
- else if (notification.getOldValue() instanceof CMPAttribute && notification.getNewValue() == null)
- return;
- if (notification.getFeature() == PERMISSION_MES_UNCHECKED_SF || notification.getFeature() == PERMISSION_MES_ROLES_SF || notification.getFeature() == getMethodElementsReference() || notification.getFeature() == getMethodElementsContainerReference())
- super.notifyChanged(notification);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java
deleted file mode 100644
index fe0e1b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java
+++ /dev/null
@@ -1,117 +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.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class MethodTransactionContentProvider extends AbstractMethodsContentProvider {
- private static final EStructuralFeature TRANSACTION_MES_SF = EjbFactoryImpl.getPackage().getMethodTransaction_MethodElements();
- private static final EStructuralFeature AD_MT_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_MethodTransactions();
-
- /**
- * Constructor for MethodTransactionContentProvider.
- *
- * @param adapterFactory
- * @param root
- * @param viewer
- */
- public MethodTransactionContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory, root);
- }
-
- /**
- * Constructor for MethodTransationContentProvider.
- *
- * @param adapterFactory
- */
- public MethodTransactionContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof MethodTransaction)
- return getEnterpriseBeans((MethodTransaction) parentElement);
- return super.getChildren(parentElement);
- }
-
- protected Object[] getEnterpriseBeans(MethodTransaction mt) {
- List mes = mt.getMethodElements();
- return getEnterpriseBeans(mt, mes);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
- */
- protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
- if (!(aRefObject instanceof MethodTransaction))
- return Collections.EMPTY_LIST;
- MethodTransaction parentMT = (MethodTransaction) aRefObject;
- if (parentMT == null)
- return Collections.EMPTY_LIST;
- return parentMT.getMethodElements(anEJB);
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object inputElement) {
- super.getElements(inputElement);
- if (inputElement instanceof EJBJar) {
- EJBJar jar = (EJBJar) inputElement;
- if (jar.getAssemblyDescriptor() != null)
- return jar.getAssemblyDescriptor().getMethodTransactions().toArray();
- }
- if (inputElement instanceof AssemblyDescriptor)
- return ((AssemblyDescriptor) inputElement).getMethodTransactions().toArray();
- return new Object[0];
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- if (element instanceof MethodTransaction)
- return !((MethodTransaction) element).getMethodElements().isEmpty();
- return super.hasChildren(element);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElementsReference()
- */
- protected EStructuralFeature getMethodElementsReference() {
- return TRANSACTION_MES_SF;
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
- */
- protected EStructuralFeature getMethodElementsContainerReference() {
- return AD_MT_SF;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java
deleted file mode 100644
index a2893b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java
+++ /dev/null
@@ -1,61 +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.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:28:55 AM)
- *
- * @author: Administrator
- */
-public class PrimaryKeyClassProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * PrimaryKeyClassProviderHelper constructor comment.
- *
- * @param cls
- * org.eclipse.jem.internal.java.JavaClass
- */
- public PrimaryKeyClassProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:54:22 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- public JavaClass getJavaClass() {
- return ((Entity) getEjb()).getPrimaryKey();
- }
-
- protected String getOverlayKey() {
- return "key_interf_ov";//$NON-NLS-1$
- }
-
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Primary_Key_Class_UI_", new Object[]{className}); //$NON-NLS-1$ = "Primary Key Class"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java
deleted file mode 100644
index 3fcb790..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java
+++ /dev/null
@@ -1,60 +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.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:28:12 AM)
- *
- * @author: Administrator
- */
-public class RemoteInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * RemoteInterfaceProviderHelper constructor comment.
- *
- * @param cls
- * org.eclipse.jem.internal.java.JavaClass
- */
- public RemoteInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:55:48 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- public JavaClass getJavaClass() {
- return getEjb().getRemoteInterface();
- }
-
- protected String getOverlayKey() {
- return "remote_interface_overlay_obj";//$NON-NLS-1$
- }
-
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Remote_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Remote Interface"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java
deleted file mode 100644
index 5ad2b0c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java
+++ /dev/null
@@ -1,65 +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
- *******************************************************************************/
-/*
- * Created on Mar 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author dfholttp
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ServiceEndpointInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * @param anEJB
- */
- public ServiceEndpointInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:53:49 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- public JavaClass getJavaClass() {
- return ((Session) getEjb()).getServiceEndpoint();
- }
-
- protected String getOverlayKey() {
- //TODO: DFH we need an icon
- return "";//$NON-NLS-1$
- }
-
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Service_Endpoint_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Home Interface"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java
deleted file mode 100644
index 0544eb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java
+++ /dev/null
@@ -1,43 +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.jst.j2ee.internal.listeners;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.events.ShellListener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-
-public interface IValidateEditListener extends ResourceStateValidatorPresenter, IPartListener, ShellListener {
- /**
- * This method should be called by any action that is about to edit any contents of any IFile.
- */
- public IStatus validateState();
-
- /**
- * Return true if there are any read only IFiles that are being managed.
- *
- * @return boolean
- * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getResources()
- */
- boolean hasReadOnlyFiles();
-
- /**
- * This method should be called prior to saving the contents. It returns true if the contents
- * can be saved.
- */
- boolean checkSave() throws CoreException;
-
- /**
- * Use this method to set the Shell that will be used to prompt to the user.
- */
- void setShell(Shell aShell);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
deleted file mode 100644
index 3f29da8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
+++ /dev/null
@@ -1,269 +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.jst.j2ee.internal.listeners;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.ListMessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-
-public class ValidateEditListener extends ShellAdapter implements IValidateEditListener {
- protected ResourceStateValidator fValidator;
- private boolean fNeedsStateValidation = true;
- private Shell fShell;
- private IWorkbenchPart fPart;
- private boolean fHasReadOnlyFiles = false;
- private boolean firstReadOnlyFileAttempt = true;
- private boolean fMessageUp = false;
- private boolean fIsActivating = false;
- private boolean fIsDeactivating = false;
-
- /**
- * Constructor for ValidateEditHandler.
- */
- public ValidateEditListener(IWorkbenchPart part, ResourceStateValidator aValidator) {
- super();
- fPart = part;
- fValidator = aValidator;
- if (part != null)
- part.getSite().getPage().addPartListener(this);
- if (getShell() != null)
- getShell().addShellListener(this);
- }
-
- protected Shell getShell() {
- if (fShell == null) {
- if (fPart != null && fPart.getSite() != null)
- fShell = fPart.getSite().getShell();
- }
- return fShell;
- }
-
- /**
- * @see IValidateEditListener#getValidator()
- */
- public ResourceStateValidator getValidator() {
- return fValidator;
- }
-
- /**
- * @see IValidateEditListener#getNeedsStateValidation()
- */
- public boolean getNeedsStateValidation() {
- return fNeedsStateValidation;
- }
-
- /**
- * @see IValidateEditListener#setNeedsStateValidation(boolean)
- */
- public void setNeedsStateValidation(boolean needsStateValidation) {
- fNeedsStateValidation = needsStateValidation;
- }
-
- /**
- * @see ResourceStateValidatorPresenter#promptForInconsistentFileRefresh(List)
- */
- public boolean promptForInconsistentFileRefresh(List inconsistentFiles) {
- if (inconsistentFiles == null || inconsistentFiles.size() == 0) // this case should never
- // occur.
- return false;
- String title = null;
- String message = null;
- String[] fileNames = new String[inconsistentFiles.size()];
- for (int i = 0; inconsistentFiles.size() > i; i++) {
- Object file = inconsistentFiles.get(i);
- if (file instanceof Resource) {
- IFile aFile = WorkbenchResourceHelper.getFile((Resource) file);
- fileNames[i] = aFile.getFullPath().toOSString();
- } else if (file instanceof IResource) {
- IResource resfile = (IResource) file;
- if (!resfile.exists()) {
- return false;
- }
- fileNames[i] = resfile.getFullPath().toOSString();
- }
- }
-
-
- title = J2EEUIMessages.getResourceString("Inconsistent_Files_3"); //$NON-NLS-1$
- message = J2EEUIMessages.getResourceString("The_following_workspace_files_are_inconsistent_with_the_editor_4"); //$NON-NLS-1$
- message += J2EEUIMessages.getResourceString("Update_the_editor_with_the_workspace_contents__5"); //$NON-NLS-1$
- return ListMessageDialog.openQuestion(getShell(), title, message, fileNames);
- }
-
- /**
- * @see ResourceStateValidatorPresenter#getValidateEditContext()
- */
- public Object getValidateEditContext() {
- return getShell();
- }
-
- /**
- * @see IPartListener#partActivated(IWorkbenchPart)
- */
- public void partActivated(IWorkbenchPart part) {
- if (part == fPart) {
- handleActivation();
- }
- }
-
- protected void handleActivation() {
- if (fIsActivating)
- return;
- fIsActivating = true;
- try {
- fValidator.checkActivation(this);
- updatePartReadOnly();
- } catch (CoreException e) {
- // do nothing for now
- } finally {
- fIsActivating = false;
- }
- }
-
- /**
- * @see org.eclipse.swt.events.ShellListener#shellActivated(ShellEvent)
- */
- public void shellActivated(ShellEvent event) {
- handleActivation();
- }
-
- /**
- * @see IPartListener#partBroughtToTop(IWorkbenchPart)
- */
- public void partBroughtToTop(IWorkbenchPart part) {
- //do nothing
- }
-
- /**
- * @see IPartListener#partClosed(IWorkbenchPart)
- */
- public void partClosed(IWorkbenchPart part) {
- if (part == fPart)
- part.getSite().getPage().removePartListener(this);
- if (getShell() != null)
- getShell().removeShellListener(this);
- }
-
- /**
- * @see IPartListener#partDeactivated(IWorkbenchPart)
- */
- public void partDeactivated(IWorkbenchPart part) {
- if (part == fPart) {
- if (fIsDeactivating)
- return;
- fIsDeactivating = true;
- try {
- fValidator.lostActivation(this);
- updatePartReadOnly();
- } catch (CoreException e) {
- // do nothing for now
- } finally {
- fIsDeactivating = true;
- }
- }
- }
-
- /**
- * @see IPartListener#partOpened(IWorkbenchPart)
- */
- public void partOpened(IWorkbenchPart part) {
- //do nothing
- }
-
- public IStatus validateState() {
- if (fNeedsStateValidation) {
- setNeedsStateValidation(false);
- IStatus status = null;
- try {
- status = fValidator.validateState(this);
- if (status.getSeverity() == IStatus.ERROR) {
- setNeedsStateValidation(true);
- if (!fMessageUp) {
- fMessageUp = true;
- MessageDialog.openError(getShell(), J2EEUIMessages.getResourceString("Error_checking_out_files_10"), status.getMessage()); //$NON-NLS-1$
- fMessageUp = false;
- }
- }
- fValidator.checkActivation(this);
- updatePartReadOnly();
- } catch (CoreException e) {
- // do nothing for now
- }
- return status;
- }
- return ResourceStateValidator.OK_STATUS;
- }
-
- /**
- * @see ResourceStateValidatorPresenter#promptForInconsistentFileOverwrite(List)
- */
- public boolean promptForInconsistentFileOverwrite(List inconsistentFiles) {
- int size = inconsistentFiles.size();
- String[] items = new String[size];
- IFile file = null;
- for (int i = 0; i < size; i++) {
- file = (IFile) inconsistentFiles.get(i);
- items[i] = file.getFullPath().toString();
- }
- return ListMessageDialog.openQuestion(getShell(), J2EEUIMessages.getResourceString("Inconsistent_files_detected_11"), //$NON-NLS-1$
- J2EEUIMessages.getResourceString("The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_"), //$NON-NLS-1$
- items);
- }
-
- protected boolean checkReadOnly() {
- fHasReadOnlyFiles = fValidator.checkReadOnly();
- return fHasReadOnlyFiles;
- }
-
- /**
- * @see IValidateEditListener#hasReadOnlyFiles()
- */
- public boolean hasReadOnlyFiles() {
- if (firstReadOnlyFileAttempt) {
- checkReadOnly();
- firstReadOnlyFileAttempt = false;
- }
- return fHasReadOnlyFiles;
- }
-
- /**
- * Method updatePartReadOnly.
- */
- protected void updatePartReadOnly() {
- if (!getNeedsStateValidation()) {
- checkReadOnly();
- setNeedsStateValidation(true);
- } else { //So that J2EEXMLActionBarContributor get updated info when editor Activated.
- firstReadOnlyFileAttempt = true;
- }
- }
-
- public boolean checkSave() throws CoreException {
- return validateState().isOK() && getValidator().checkSave(this);
- }
-
- public void setShell(Shell aShell) {
- fShell = aShell;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
deleted file mode 100644
index f9fc213..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Dec 7, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.perspective;
-
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.progress.IProgressConstants;
-
-/**
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EEPerspective implements org.eclipse.ui.IPerspectiveFactory {
-
- protected static String ID_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$
- //protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.wst.navigator.ui.WTPCommonNavigator"; //$NON-NLS-1$
- protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator"; //$NON-NLS-1$
-
- private static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$
- private static String ID_EJB_PROJECT_WIZARD = "org.eclipse.jst.ejb.ui.EJBComponentCreationWizard"; //$NON-NLS-1$
- private static String ID_RAR_PROJECT_WIZARD = "org.eclipse.jst.j2ee.jca.ui.ConnectorComponentCreationWizard"; //$NON-NLS-1$
- private static String ID_APPCLIENT_PROJECT_WIZARD = "org.eclipse.jst.j2ee.internal.wizard.AppClientComponentCreationWizard"; //$NON-NLS-1$
- private static String ID_EAR_PROJECT_WIZARD = "org.eclipse.jst.j2ee.internal.wizard.EARComponentCreationWizard"; //$NON-NLS-1$
- private static String ID_DYNAMIC_WEB_COMPONENT_WIZARD = "org.eclipse.jst.servlet.ui.WebComponentCreationWizard"; //$NON-NLS-1$
- private static String ID_STATIC_WEB_COMPONENT_WIZARD = "org.eclipse.wst.web.ui.internal.wizards.SimpleWebModuleCreation"; //$NON-NLS-1$
- private static final String ID_SEARCH_VIEW = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$
- public static final String ID_CONSOLE_VIEW= "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$
-
- public J2EEPerspective() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
- */
- public void createInitialLayout(IPageLayout layout) {
- defineLayout(layout);
- defineActions(layout);
- }
-
-
-
- public void defineActions(IPageLayout layout) {
- layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet"); //$NON-NLS-1$
- layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet2"); //$NON-NLS-1$
- layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet3"); //$NON-NLS-1$
- layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet4"); //$NON-NLS-1$
- layout.addActionSet("org.eclipse.jdt.ui.JavaActionSet"); //$NON-NLS-1$
-
- layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
- layout.addActionSet(IDebugUIConstants.DEBUG_ACTION_SET);
-
- layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
-
- layout.addShowViewShortcut(ID_J2EE_HIERARCHY_VIEW);
- layout.addShowViewShortcut(ID_SERVERS_VIEW);
- layout.addShowViewShortcut(IPageLayout.ID_BOOKMARKS);
- layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
- layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
- layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
- layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
- layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
- layout.addShowViewShortcut(ID_WST_SNIPPETS_VIEW);
-
- // views - search
- layout.addShowViewShortcut(ID_SEARCH_VIEW);
- // views - debugging
- layout.addShowViewShortcut(ID_CONSOLE_VIEW);
-
- layout.addNewWizardShortcut(ID_DYNAMIC_WEB_COMPONENT_WIZARD);
- layout.addNewWizardShortcut(ID_STATIC_WEB_COMPONENT_WIZARD);
- layout.addNewWizardShortcut(ID_EJB_PROJECT_WIZARD);
- layout.addNewWizardShortcut(ID_RAR_PROJECT_WIZARD);
- layout.addNewWizardShortcut(ID_APPCLIENT_PROJECT_WIZARD);
- layout.addNewWizardShortcut(ID_EAR_PROJECT_WIZARD);
-
- // Add "new wizards"
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.project");//$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
-
- layout.addShowInPart(ID_J2EE_HIERARCHY_VIEW);
- }
-
- public void defineLayout(IPageLayout layout) {
- // Editors are placed for free.
- String editorArea = layout.getEditorArea();
-
- // Top left.
- IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.25f, editorArea);//$NON-NLS-1$
- topLeft.addView(ID_J2EE_HIERARCHY_VIEW);
- topLeft.addPlaceholder(IPageLayout.ID_RES_NAV);
- topLeft.addPlaceholder(JavaUI.ID_TYPE_HIERARCHY);
- topLeft.addPlaceholder(JavaUI.ID_PACKAGES_VIEW);
-
- // Bottom right.
- IFolderLayout bottomRight = layout.createFolder("bottomRight", IPageLayout.BOTTOM, 0.7f, editorArea);//$NON-NLS-1$
- bottomRight.addView(IPageLayout.ID_PROBLEM_VIEW);
- bottomRight.addView(IPageLayout.ID_TASK_LIST);
- bottomRight.addView(IPageLayout.ID_PROP_SHEET);
- bottomRight.addView(ID_SERVERS_VIEW);
- bottomRight.addView(ID_WST_SNIPPETS_VIEW);
-
- bottomRight.addPlaceholder(ID_CONSOLE_VIEW);
- bottomRight.addPlaceholder(IPageLayout.ID_BOOKMARKS);
- bottomRight.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
- bottomRight.addPlaceholder(ID_SEARCH_VIEW);
-
- // Top right.
- IFolderLayout topRight = layout.createFolder("topRight", IPageLayout.RIGHT, 0.7f, editorArea);//$NON-NLS-1$
- topRight.addView(IPageLayout.ID_OUTLINE);
- }
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java
deleted file mode 100644
index bf58cbb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java
+++ /dev/null
@@ -1,101 +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.jst.j2ee.internal.plugin;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.EditorManager;
-
-
-
-public class CommonEditorUtility {
-
- public static final Class IRESOURCE_CLASS = IResource.class;
-
- private CommonEditorUtility() {
- super();
- }
-
- /**
- * Returns an array of all editors that have an unsaved content. If the identical content is
- * presented in more than one editor, only one of those editor parts is part of the result.
- *
- * @return an array of all dirty editor parts.
- */
- public static IEditorPart[] getDirtyEditors() {
- return getDirtyEditors(null);
- }
-
- /**
- * Returns an array of all editors that have an unsaved content, where the content is include in
- * one of the projects in the List parameter. If the identical content is presented in more than
- * one editor, only one of those editor parts is part of the result.
- *
- * @return an array of all dirty editor parts.
- */
- public static IEditorPart[] getDirtyEditors(List projects) {
- Set inputs = new HashSet();
- List result = new ArrayList(0);
- IWorkbench workbench = J2EEUIPlugin.getPluginWorkbench();
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; x < pages.length; x++) {
- IEditorPart[] editors = pages[x].getDirtyEditors();
- for (int z = 0; z < editors.length; z++) {
- IEditorPart ep = editors[z];
- IEditorInput input = ep.getEditorInput();
- if (!inputs.contains(input) && (projects == null || inputInProjects(input, projects))) {
- inputs.add(input);
- result.add(ep);
- }
- }
- }
- }
- return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
- }
-
- public static boolean inputInProjects(IEditorInput input, List projects) {
- IResource res = (IResource) input.getAdapter(IRESOURCE_CLASS);
- IProject project = res == null ? null : res.getProject();
- if (project == null)
- return false;
- for (int i = 0; i < projects.size(); i++) {
- if (project.equals(projects.get(i)))
- return true;
- }
- return false;
- }
-
- public static boolean promptToSaveAllDirtyEditors() {
- return promptToSaveDirtyEditors(Arrays.asList(getDirtyEditors()));
- }
-
- public static boolean promptToSaveDirtyEditors(List dirtyEditors) {
- if (dirtyEditors.isEmpty())
- return true;
- return EditorManager.saveAll(dirtyEditors, true, J2EEUIPlugin.getActiveWorkbenchWindow());
- }
-
- public static boolean promptToSaveDirtyEditorsInProjects(List projects) {
- return promptToSaveDirtyEditors(Arrays.asList(getDirtyEditors(projects)));
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java
deleted file mode 100644
index 60f11ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java
+++ /dev/null
@@ -1,192 +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.jst.j2ee.internal.plugin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Added a Details button to the MessageDialog to show the exception stack trace.
- *
- * Borrowed from an eclipse InternalErrorDialog
- */
-public class ErrorDialog extends MessageDialog {
- protected static final String[] LABELS_OK = {IDialogConstants.OK_LABEL};
- protected static final String[] LABELS_OK_CANCEL = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL};
- protected static final String[] LABELS_OK_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- protected static final String[] LABELS_OK_CANCEL_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- private Throwable detail;
- private int detailButtonID = -1;
- private Text text;
- private String message;
- //Workaround. SWT does not seem to set the default button if
- //there is not control with focus. Bug: 14668
- private int defaultButtonIndex = 0;
- /**
- * Size of the text in lines.
- */
- private static final int TEXT_LINE_COUNT = 15;
-
- public ErrorDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, Throwable detail, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- defaultButtonIndex = defaultIndex;
- this.detail = detail;
- message = dialogMessage;
- setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.RESIZE);
- }
-
- //Workaround. SWT does not seem to set rigth the default button if
- //there is not control with focus. Bug: 14668
- public int open() {
- create();
- Button b = getButton(defaultButtonIndex);
- b.setFocus();
- b.getShell().setDefaultButton(b);
- return super.open();
- }
-
- /**
- * Set the detail button;
- */
- public void setDetailButton(int index) {
- detailButtonID = index;
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected void buttonPressed(int buttonId) {
- if (buttonId == detailButtonID) {
- toggleDetailsArea();
- } else {
- setReturnCode(buttonId);
- close();
- }
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user pressing the details
- * button.
- */
- private void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- if (text != null) {
- text.dispose();
- text = null;
- getButton(detailButtonID).setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- createDropDownText((Composite) getContents());
- getButton(detailButtonID).setText(IDialogConstants.HIDE_DETAILS_LABEL);
- }
- Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
- }
-
- /**
- * Create this dialog's drop-down list component.
- *
- * @param parent
- * the parent composite
- * @return the drop-down list component
- */
- protected void createDropDownText(Composite parent) {
- // create the list
- text = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- // print the stacktrace in the text field
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(baos);
- detail.printStackTrace(ps);
- if ((detail instanceof SWTError) && (((SWTError) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTError) detail).throwable.printStackTrace(ps);
- } else if ((detail instanceof SWTException) && (((SWTException) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTException) detail).throwable.printStackTrace(ps);
- }
- ps.flush();
- baos.flush();
- text.setText(baos.toString());
- } catch (IOException e) {
- //Ignore
- }
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- data.heightHint = text.getLineHeight() * TEXT_LINE_COUNT;
- text.setLayoutData(data);
- }
-
- public static boolean openError(Shell parent, String title, String message, Throwable detail, int defaultIndex, boolean showCancel) {
- String[] labels;
- if (detail == null)
- labels = showCancel ? LABELS_OK_CANCEL : LABELS_OK;
- else
- labels = showCancel ? LABELS_OK_CANCEL_DETAILS : LABELS_OK_DETAILS;
- ErrorDialog dialog = new ErrorDialog(parent, title, null, // accept
- // the
- // default
- // window
- // icon
- message, detail, ERROR, labels, defaultIndex);
- if (detail != null)
- dialog.setDetailButton(labels.length - 1);
- return dialog.open() == 0;
- }
-
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- ((GridLayout) composite.getLayout()).numColumns = 2;
- // create image
- Image image = composite.getDisplay().getSystemImage(SWT.ICON_ERROR);
- if (image != null) {
- Label label = new Label(composite, 0);
- image.setBackground(label.getBackground());
- label.setImage(image);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING));
- }
- // create message
- if (message != null) {
- Label label = new Label(composite, SWT.WRAP);
- label.setText(message);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
- label.setLayoutData(data);
- label.setFont(parent.getFont());
- }
- return composite;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java
deleted file mode 100644
index b6a89c4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jem.internal.adapters.jdom.JavaClassJDOMAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * A number of routines for working with JavaElements in editors
- *
- * Use 'isOpenInEditor' to test if an element is already open in a editor Use 'openInEditor' to
- * force opening an element in a editor With 'getWorkingCopy' you get the working copy (element in
- * the editor) of an element
- */
-public class J2EEEditorUtility {
- // //$NON-NLS-1$
- public static final String EJB_JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.misc.EJBJavaEditor"; //$NON-NLS-1$
-
- public static ICompilationUnit getCompilationUnit(JavaClass javaClass) {
- IProject project = ProjectUtilities.getProject(javaClass);
- if (project == null)
- return null;
- return getCompilationUnit(javaClass, project);
- }
-
- public static ICompilationUnit getCompilationUnit(JavaClass javaClass, IProject project) {
- if (javaClass == null)
- return null;
- IJavaProject javaProj = getJavaProject(project);
- if (javaProj == null)
- return null;
- return getCompilationUnit(javaClass, javaProj);
- }
-
- public static ICompilationUnit getCompilationUnit(JavaClass javaClass, IJavaProject javaProject) {
- if (javaClass == null)
- return null;
- IType type = getType(javaClass);
- if (type != null)
- return type.getCompilationUnit();
- return null;
- }
-
- public static IType getType(JavaClass javaClass) {
- if (javaClass != null) {
- JavaClassJDOMAdaptor adaptor = (JavaClassJDOMAdaptor) EcoreUtil.getRegisteredAdapter(javaClass, ReadAdaptor.TYPE_KEY);
- if (adaptor != null)
- return adaptor.getSourceType();
- }
- return null;
- }
-
- public static IEditorInput getEditorInput(Object input) {
- if (input instanceof EObject)
- return new FileEditorInput(WorkbenchResourceHelper.getFile((EObject) input));
- if (input instanceof IFile)
- return new FileEditorInput((IFile) input);
- return null;
- }
-
- public static IFile getFile(JavaClass javaClass) {
- ICompilationUnit comp = getCompilationUnit(javaClass);
- if (comp == null)
- return null;
- IEditorInput input = null;
- try {
- input = EditorUtility.getEditorInput(comp);
- } catch (JavaModelException ex) {
- return null;
- }
- if (input != null) {
- return (IFile) input.getAdapter(IFile.class);
- }
- return null;
- }
-
- public static IJavaProject getJavaProject(IProject aProject) {
- if (aProject == null)
- return null;
- IJavaModel javaModel = JemProjectUtilities.getJavaModel();
- return javaModel.getJavaProject(aProject.getName());
- }
-
- /**
- * Return the IPackageFragment for the JavaPackage for
- *
- * @javaClass.
- */
- public static IPackageFragment getPackageFragment(JavaClass javaClass, IJavaProject javaProject) {
- if (javaProject != null) {
- try {
- JavaPackage javaPackage = (JavaPackage) javaClass.eContainer();
- String packageName = javaPackage.getName();
- IPackageFragment[] pkgFrags = javaProject.getPackageFragments();
- for (int i = 0; i < pkgFrags.length; i++) {
- if ((pkgFrags[i].getElementName().equals(packageName)))
- return pkgFrags[i];
- }
- } catch (JavaModelException e) {
- //Ignore
- }
- }
- return null;
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(JavaClass javaClass, IProject aProject) throws JavaModelException, PartInitException {
- return openInEditor(javaClass, getJavaProject(aProject));
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(JavaClass javaClass, IJavaProject javaProject) throws JavaModelException, PartInitException {
- if (javaClass == null || javaProject == null)
- return null;
- IType type = getType(javaClass);
- if (type == null)
- return openInEditor(getCompilationUnit(javaClass, javaProject));
- return EditorUtility.openInEditor(type);
- }
-
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(JavaClass javaClass, IJavaProject javaProject, String editorId) throws JavaModelException, PartInitException {
- return openInEditor(getCompilationUnit(javaClass, javaProject), editorId);
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(ICompilationUnit aCompilationUnit) throws JavaModelException, PartInitException {
- return EditorUtility.openInEditor(aCompilationUnit);
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(ICompilationUnit aCompilationUnit, String editorId) throws JavaModelException, PartInitException {
- return openInEditor(EditorUtility.getEditorInput(aCompilationUnit), editorId);
- }
-
- private static IEditorPart openInEditor(IEditorInput input, String editorID) throws PartInitException {
- if (input != null) {
- IWorkbenchPage p = J2EEUIPlugin.getActiveWorkbenchWindow().getActivePage();
- if (p != null)
- return p.openEditor(input, editorID, true);
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java
deleted file mode 100644
index 372f44c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Jun 30, 2004
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author jlanuti
- */
-public class J2EEUIAdapterFactory implements IAdapterFactory {
-
- protected static final Class ILAUNCHABLE_CLASS = ILaunchable.class;
-
- /**
- * Default Constructor
- */
- public J2EEUIAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adaptableObject instanceof EObject) {
- if (adapterType == ILAUNCHABLE_CLASS)
- return adaptableObject;
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{ILAUNCHABLE_CLASS};
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java
deleted file mode 100644
index 7d8053c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java
+++ /dev/null
@@ -1,30 +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
- *******************************************************************************/
-/*
- * Created on Feb 27, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface J2EEUIContextIds {
-
- // Delete Enterprise Bean Dialog
- public static final String DELETE_ENTERPRISE_BEAN_DIALOG = J2EEUIPlugin.PLUGIN_ID + ".delb1000"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java
deleted file mode 100644
index 0201da1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java
+++ /dev/null
@@ -1,216 +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.jst.j2ee.internal.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.common.frameworks.internal.Messages;
-
-
-public class J2EEUIMessages extends Messages {
-
- private static final J2EEUIMessages INSTANCE = new J2EEUIMessages();
-
- public static final String PROJECT_LOC_LBL = "1"; //$NON-NLS-1$
- public static final String TARGET_RUNTIME_LBL = "2"; //$NON-NLS-1$
- public static final String J2EE_VERSION_LBL = "3"; //$NON-NLS-1$
- public static final String IMAGE_LOAD_ERROR = "4"; //$NON-NLS-1$
- public static final String APP_PROJECT_WIZ_TITLE = "5"; //$NON-NLS-1$
- public static final String APP_PROJECT_MAIN_PG_TITLE = "6"; //$NON-NLS-1$
- public static final String APP_PROJECT_MAIN_PG_DESC = "7"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_TITLE = "8"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_DESC = "9"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_SELECT = "10"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_DESELECT = "11"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_NEW = "12"; //$NON-NLS-1$
- public static final String EAR_PROJECT_FOR_MODULE_CREATION = "13"; //$NON-NLS-1$
- public static final String NEW_THREE_DOTS_E = "14"; //$NON-NLS-1$
- public static final String NEW_THREE_DOTS_W = "14a"; //$NON-NLS-1$
- public static final String LINK_MODULETO_EAR_PROJECT = "15"; //$NON-NLS-1$
- public static final String NEW_MOD_SEL_PG_TITLE = "16"; //$NON-NLS-1$
- public static final String NEW_MOD_SEL_PG_DESC = "17"; //$NON-NLS-1$
- public static final String NEW_MOD_WIZ_TITLE = "18"; //$NON-NLS-1$
- public static final String NEW_MOD_SEL_PG_DEF_BTN = "19"; //$NON-NLS-1$
- public static final String APP_CLIENT_PROJ_LBL = "20"; //$NON-NLS-1$
- public static final String EJB_PROJ_LBL = "21"; //$NON-NLS-1$
- public static final String WEB_PROJ_LBL = "22"; //$NON-NLS-1$
- public static final String JCA_PROJ_LBL = "23"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_PROJECT_WIZ_TITLE = "24"; //$NON-NLS-1$
- public static final String APP_CLIENT_VERSION_LBL = "3"; //$NON-NLS-1$
- public static final String APP_CLIENT_PROJECT_MAIN_PG_TITLE = "25"; //$NON-NLS-1$
- public static final String APP_CLIENT_SETTINGS = "101"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_PROJECT_MAIN_PG_DESC = "26"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_TITLE = "27"; //$NON-NLS-1$
-
- public static final String MODULES_DEPENDENCY_PAGE_DESC = "28"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_AVAILABLE_JARS = "29"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_CLASSPATH = "30"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_TABLE_MODULE = "31"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_TABLE_PROJECT = "32"; //$NON-NLS-1$
- public static final String NEW_LBL = "33"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_MAIN_PG_DESC = "34"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_MAIN_PG_TITLE = "35"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_FILE_LABEL = "36"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_IMPORT_PROJECT_LABEL = "37"; //$NON-NLS-1$
-
- public static final String IMPORT_WIZ_TITLE = "38"; //$NON-NLS-1$
- public static final String EAR_IMPORT_MAIN_PG_DESC = "39"; //$NON-NLS-1$
- public static final String EAR_IMPORT_MAIN_PG_TITLE = "40"; //$NON-NLS-1$
- public static final String EAR_IMPORT_FILE_LABEL = "41"; //$NON-NLS-1$
- public static final String OVERWRITE_RESOURCES = "42"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_TYPE = "43"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_TYPE_BINARY = "44"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_TYPE_SOURCE = "45"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PARTIAL_DEVELOPMENT = "46"; //$NON-NLS-1$
- public static final String EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON = "48"; //$NON-NLS-1$
- public static final String EAR_IMPORT_SELECT_ALL_UTIL_BUTTON = "47"; //$NON-NLS-1$
- public static final String EAR_IMPORT_JARS_GROUP = "49"; //$NON-NLS-1$
- public static final String EAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS = "50"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_PG_DESC = "51"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_PG_TITLE = "52"; //$NON-NLS-1$
- public static final String PROJECT_LOCATIONS_GROUP = "53"; //$NON-NLS-1$
- public static final String NEW_PROJECT_GROUP_DESCRIPTION = "54"; //$NON-NLS-1$
- public static final String USE_DEFAULT_ROOT_RADIO = "55"; //$NON-NLS-1$
- public static final String USE_ALTERNATE_ROOT_RADIO = "56"; //$NON-NLS-1$
- public static final String SELECT_DIRECTORY_DLG = "57"; //$NON-NLS-1$
- public static final String EAR_IMPORT_Modules_in_EAR = "58"; //$NON-NLS-1$
- public static final String EAR_IMPORT_New_Project_Name = "59"; //$NON-NLS-1$
- public static final String EAR_IMPORT_FILENAMES = "60"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECTNAMES = "61"; //$NON-NLS-1$
- public static final String J2EE_EXPORT_DESTINATION = "62"; //$NON-NLS-1$
- public static final String J2EE_EXPORT_OVERWRITE_CHECKBOX = "63"; //$NON-NLS-1$
- public static final String J2EE_EXPORT_SOURCE_CHECKBOX = "64"; //$NON-NLS-1$
- public static final String APP_CLIENT_EXPORT_MAIN_PG_TITLE = "65"; //$NON-NLS-1$
- public static final String APP_CLIENT_EXPORT_MAIN_PG_DESC = "66"; //$NON-NLS-1$
- public static final String EXPORT_WIZ_TITLE = "67"; //$NON-NLS-1$
- public static final String EAR_EXPORT_MAIN_PG_TITLE = "68"; //$NON-NLS-1$
- public static final String EAR_EXPORT_MAIN_PG_DESC = "69"; //$NON-NLS-1$
- public static final String EAR_EXPORT_INCLUDE_PROJECT_FILES = "70"; //$NON-NLS-1$
- public static final String EAR_EXPORT_INCLUDE_PROJECT_FILES_DESC = "71"; //$NON-NLS-1$
- public static final String EAR_IMPORT_INCLUDE_PROJECT = "72"; //$NON-NLS-1$
- public static final String EAR_IMPORT_OVERWRITE_NESTED = "74"; //$NON-NLS-1$
- public static final String DELETE_PROJECT = "75"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_LABEL = "76"; //$NON-NLS-1$
-
- //string for migration
- public static final String ERROR_OCCURRED_TITLE = "77"; //$NON-NLS-1$
- public static final String ERROR_OCCURRED_MESSAGE = "78"; //$NON-NLS-1$
- public static final String BINARY_PROJECT = "79"; //$NON-NLS-1$
- public static final String ACTION_CANNOT_BE_PERFORMED_ON_BIN_PROJECT = "80"; //$NON-NLS-1$
- public static final String INFORMATION_UI_ = "81"; //$NON-NLS-1$
- public static final String CHOSEN_OP_NOT_AVAILABLE = "82"; //$NON-NLS-1$
-
- public static final String CREATE_EJB_CLIENT_JAR = "90"; //$NON-NLS-1$
- public static final String USE_ANNOTATIONS = "91"; //$NON-NLS-1$
- public static final String USE_ANNOTATIONS_SERVLET = "98"; //$NON-NLS-1$
- public static final String ADD_ANNOTATIONS_SUPPORT = "92"; //$NON-NLS-1$
- public static final String BROWSE_LABEL = "93"; //$NON-NLS-1$
- public static final String NAME_LABEL = "94"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_CREATE_MAIN = "95"; //$NON-NLS-1$
- public static final String CREATE_DEFAULT_SESSION_BEAN = "96"; //$NON-NLS-1$
-
- public static final String MODULE_NAME = "99"; //$NON-NLS-1$
- public static final String MODULE_VERSION_LABEL = "100"; //$NON-NLS-1$
-
- public static final String J2EE_UTILITY_JAR_LISTEAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS = "97"; //$NON-NLS-1$
-
- public static final String FLEXIBLE_PROJECT_WIZ_TITLE = "FlexibleProjectCreationWizard.title"; //$NON-NLS-1$
- public static final String FLEXIBLE_PROJECT_MAIN_PG_TITLE = "FlexibleProjectCreationWizard.mainPage.title"; //$NON-NLS-1$
- public static final String FLEXIBLE_PROJECT_MAIN_PG_DESC = "FlexibleProjectCreationWizard.mainPage.desc"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_WIZ_TITLE = "EARComponentCreationWizard.title"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_MAIN_PG_TITLE = "EARComponentCreationWizard.mainPage.title"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_MAIN_PG_DESC = "EARComponentCreationWizard.mainPage.desc"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_SECOND_PG_TITLE = "EARComponentCreationWizard.secondPage.title"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_SECOND_PG_DESC = "EARComponentCreationWizard.secondPage.desc"; //$NON-NLS-1$
- public static final String APPCLIENT_COMPONENT_WIZ_TITLE = "AppClientComponentCreationWizard.title"; //$NON-NLS-1$
- public static final String APPCLIENT_COMPONENT_MAIN_PG_TITLE = "AppClientComponentCreationWizard.mainPage.title"; //$NON-NLS-1$
- public static final String APPCLIENT_COMPONENT_MAIN_PG_DESC = "AppClientComponentCreationWizard.mainPage.desc"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_WIZ_TITLE = "DefaultJ2EEComponentCreationWizard.title"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_TITLE = "DefaultJ2EEComponentCreationWizard.page.title"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_DESC = "DefaultJ2EEComponentCreationWizard.page.desc"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_EJB_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.ejb"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_WEB_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.web"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_JCA_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.jca"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_APPCLIENT_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.appclient"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_NEW_MOD_SEL_PG_DEF_BTN = "DefaultJ2EEComponentCreationWizard.page.button.select"; //$NON-NLS-1$
-
- public final static String EMPTY_STRING = ""; //$NON-NLS-1$
- public final static String FOLDER_LABEL = getResourceString("FOLDER_LABEL"); //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL = getResourceString("BROWSE_BUTTON_LABEL"); //$NON-NLS-1$
- public final static String JAVA_PACKAGE_LABEL = getResourceString("JAVA_PACKAGE_LABEL"); //$NON-NLS-1$
- public final static String CLASS_NAME_LABEL = getResourceString("CLASS_NAME_LABEL"); //$NON-NLS-1$
- public final static String SUPERCLASS_LABEL = getResourceString("SUPERCLASS_LABEL"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_TITLE = getResourceString("CONTAINER_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_DESC = getResourceString("CONTAINER_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = getResourceString("CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_TITLE = getResourceString("PACKAGE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_DESC = getResourceString("PACKAGE_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = getResourceString("PACKAGE_SELECTION_DIALOG_MSG_NONE"); //$NON-NLS-1$
- public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = getResourceString("SUPERCLASS_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String SUPERCLASS_SELECTION_DIALOG_DESC = getResourceString("SUPERCLASS_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String JAVA_CLASS_MODIFIERS_LABEL = getResourceString("JAVA_CLASS_MODIFIERS_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_INTERFACES_LABEL = getResourceString("JAVA_CLASS_INTERFACES_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_METHOD_STUBS_LABEL = getResourceString("JAVA_CLASS_METHOD_STUBS_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_PUBLIC_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_FINAL_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_MAIN_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_INHERIT_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String ADD_BUTTON_LABEL = getResourceString("ADD_BUTTON_LABEL"); //$NON-NLS-1$
- public static final String REMOVE_BUTTON = getResourceString("REMOVE_BUTTON"); //$NON-NLS-1$
- public final static String INTERFACE_SELECTION_DIALOG_TITLE = getResourceString("INTERFACE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
-
- public static final String JAVAUTIL_COMPONENT_WIZ_TITLE="JAVAUTIL_COMPONENT_WIZ_TITLE"; //$NON-NLS-1$
- public static final String JAVAUTILITY_MAIN_PG_TITLE = "JAVAUTILITY_MAIN_PG_TITLE";//$NON-NLS-1$
- public final static String JAVAUTILITY_MAIN_PG_DESC = "JAVAUTILITY_MAIN_PG_DESC";//$NON-NLS-1$
- public static final String AVAILABLE_J2EE_COMPONENTS="AVAILABLE_J2EE_COMPONENTS"; //$NON-NLS-1$
- public static final String EXTERNAL_JAR="EXTERNAL_JAR";//$NON-NLS-1$
- public static final String PROJECT_JAR="PROJECT_JAR";//$NON-NLS-1$
- public static final String ADDVARIABLE="ADDVARIABLE";//$NON-NLS-1$
- public static final String SUPPORTMULTIPLEMODULES="SUPPORTMULTIPLEMODULES";//$NON-NLS-1$
- public static final String SOURCEFOLDER="SOURCEFOLDER";//$NON-NLS-1$
- public static final String CONTENT_FOLDER = "102"; //$NON-NLS-1$
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return INSTANCE.doGetResourceString(key);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return INSTANCE.doGetResourceString(key, args);
- }
-
- private J2EEUIMessages() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.Messages#initializeBundle()
- */
- protected void initializeBundle() {
- try {
- resourceBundle = ResourceBundle.getBundle("j2ee_ui"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- //Ignore
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java
deleted file mode 100644
index b127ed0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java
+++ /dev/null
@@ -1,269 +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.jst.j2ee.internal.plugin;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashSet;
-
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.internal.wizard.ImportUtil;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class J2EEUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.ui"; //$NON-NLS-1$
-
- //The shared instance.
- private static J2EEUIPlugin plugin;
- private static IPath location;
-
- /**
- * The constructor.
- */
- public J2EEUIPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static J2EEUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public static IPath getInstallLocation() {
- if (location == null) {
- URL url = getInstallURL();
- try {
- String installLocation = ((PlatformURLConnection) url.openConnection()).getURLAsLocal().getFile();
- location = new Path(installLocation);
- } catch (IOException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{url}) + e); //$NON-NLS-1$
- }
- }
- return location;
- }
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- public static String getArchiveDefaultProjectName(Archive anArchive) {
- if (anArchive == null)
- return null;
- int type = getArchiveType(anArchive);
- return getTypeDefaultProjectName(anArchive.getURI(), type);
- }
-
- public static String getArchiveDefaultUtilProjectName(Archive anArchive) {
- if (anArchive == null)
- return null;
- int type = getArchiveType(anArchive);
- return getTypeDefaultUtilProjectName(anArchive.getName(), type);
- }
-
- public static String getArchiveDefaultProjectName(Archive anArchive, HashSet moduleNames) {
- if (anArchive == null)
- return null;
- int type = getArchiveType(anArchive);
- return getTypeDefaultProjectName(anArchive.getURI(), type, moduleNames);
- }
-
- public static int getArchiveType(Archive anArchive) {
- int type = ImportUtil.UNKNOWN;
- try {
- try {
- if (anArchive.isEJBJarFile())
- type = ImportUtil.EJBJARFILE;
- else if (anArchive.isWARFile())
- type = ImportUtil.WARFILE;
- else if (anArchive.isApplicationClientFile())
- type = ImportUtil.CLIENTJARFILE;
- else if (anArchive.isRARFile())
- type = ImportUtil.RARFILE;
- else if (anArchive.isEARFile())
- type = ImportUtil.EARFILE;
- } catch (Exception e) {
- //Ignore
- }
- } finally {
- if (anArchive != null)
- anArchive.close();
- }
- return type;
- }
-
- public static String getTypeDefaultProjectName(String text, int type) {
- IPath path = new Path(text);
- text = path.makeRelative().removeFileExtension().lastSegment();
-
- boolean exists = false;
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(text);
- if (project != null && project.exists())
- exists = true;
- if (exists && text.toLowerCase().indexOf(ImportUtil.SUFFIXES[type].toLowerCase()) == -1)
- text = text + ImportUtil.SUFFIXES[type];
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int j = 1; j < 10; j++) {
- boolean found = false;
- String iteratedProjectName = text + ((j == 1) ? "" : Integer.toString(j)); //$NON-NLS-1$
- for (int i = 0; !found && (i < projects.length); i++) {
- if ((projects[i]).getName().equalsIgnoreCase(iteratedProjectName)) {
- found = true;
- }
- }
- if (!found)
- return iteratedProjectName;
- }
- return text;
- }
-
- private static String getTypeDefaultProjectName(String text, int type, HashSet moduleNames) {
- IPath path = new Path(text);
- text = path.makeRelative().removeFileExtension().lastSegment();
-
- boolean isValidName = moduleNames.add(text);
- boolean exists = false;
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(text);
- if (project != null && project.exists())
- exists = true;
- if (!isValidName || (exists && text.toLowerCase().indexOf(ImportUtil.SUFFIXES[type].toLowerCase()) == -1))
- text = text + ImportUtil.SUFFIXES[type];
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int j = 1; j < 10; j++) {
- boolean found = false;
- String iteratedProjectName = text + ((j == 1) ? "" : Integer.toString(j)); //$NON-NLS-1$
- for (int i = 0; !found && (i < projects.length); i++) {
- if ((projects[i]).getName().equalsIgnoreCase(iteratedProjectName)) {
- found = true;
- }
- }
- if (!found)
- return iteratedProjectName;
- }
- return text;
- }
-
- // the following two methods are used by web editor
-
- private static String getTypeDefaultUtilProjectName(String text, int type) {
- text = text.substring(text.lastIndexOf(java.io.File.separator) + 1);
- int i = text.lastIndexOf('.');
- if (i > 0)
- text = text.substring(0, i);
- if (text.toLowerCase().indexOf(ImportUtil.SUFFIXES[type].toLowerCase()) == -1)
- text = text + ImportUtil.SUFFIXES[type];
- IProject[] projects = getWorkspace().getRoot().getProjects();
- for (int j = 0; j < 10; j++) {
- boolean found = false;
- String iteratedProjectName = text + ((j == 0) ? "" : Integer.toString(j)); //$NON-NLS-1$
- for (i = 0; !found && (i < projects.length); i++) {
- if ((projects[i]).getName().equalsIgnoreCase(iteratedProjectName)) {
- found = true;
- }
- }
- if (!found)
- return iteratedProjectName;
- }
- return text;
- }
-
- /**
- * Get a .gif from the image registry.
- */
- public Image getImage(String key) {
- ImageRegistry imageRegistry = getImageRegistry();
- Image image = imageRegistry.get(key);
- if (image == null || image.isDisposed()) {
- ImageDescriptor descriptor = getImageDescriptor(key);
- if (descriptor != null) {
- image = descriptor.createImage();
- imageRegistry.put(key, image);
- }
- }
- return image;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key);
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- /**
- * @param key
- * @return
- */
- private URL getImageURL(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
- public static IWorkbenchWindow getActiveWorkbenchWindow() {
- return getPluginWorkbench().getActiveWorkbenchWindow();
- }
-
- /**
- * Return the workbench
- *
- * This method is internal to the j2ee plugin and must not be called by any other plugins.
- */
-
- public static IWorkbench getPluginWorkbench() {
- return getDefault().getWorkbench();
-
- }
-
- public static IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
-
- }
- return null;
- }
-
-
-
- }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java
deleted file mode 100644
index 6740842..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-/*
- * Created on Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class J2EEUIPluginIcons {
-
- public static String EAR_IMPORT_WIZARD_BANNER = "import_ear_wiz"; //$NON-NLS-1$
- public static final String JCA_IMPORT_WIZARD_BANNER = "import_rar_wiz"; //$NON-NLS-1$
- public static final String EJB_IMPORT_WIZARD_BANNER = "import_ejbjar_wiz"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_WIZARD_BANNER = "import_appclient_wiz"; //$NON-NLS-1$
- public static final String WEB_IMPORT_WIZARD_BANNER = "import_war_wiz"; //$NON-NLS-1$
- public static final String EAR_WIZ_BANNER = "ear_wiz"; //$NON-NLS-1$
- public static final String APP_CLIENT_PROJECT_WIZARD_BANNER = "appclient_wiz"; //$NON-NLS-1$
- //EJB Icons
- public static final String EJB_PROJECT_WIZARD_BANNER = "ejbproject_wiz"; //$NON-NLS-1$
- //WEB Icons
- public static final String WEB_PROJECT_WIZARD_BANNER = "war_wiz"; //$NON-NLS-1$
- //JCA Icons
- public static final String JCA_PROJECT_WIZARD_BANNER = "connector_wiz"; //$NON-NLS-1$
- public static final String APP_CLIENT_EXPORT_WIZARD_BANNER = "export_appclient_wiz"; //$NON-NLS-1$
- public static final String EJB_EXPORT_WIZARD_BANNER = "export_ejbjar_obj"; //$NON-NLS-1$;
- public static final String WEB_EXPORT_WIZARD_BANNER = "export_war_wiz"; //$NON-NLS-1$;
- public static final String JCA_EXPORT_WIZARD_BANNER = "export_rar_wiz"; //$NON-NLS-1$;
- public static final String EAR_EXPORT_WIZARD_BANNER = "export_ear_wiz"; //$NON-NLS-1$;
-
- //Migration Wizard Icons
-
- public static final String WARNING_TASK = "showwarn_tsk"; //$NON-NLS-1$
-
- public static final String CLIENT_BANNER = "ejbclientjar_wizban"; //$NON-NLS-1$
-
- public static final String MIGRATION_WIZARD_BANNER = "versionmigrate3_wiz"; //$NON-NLS-1$
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java
deleted file mode 100644
index 27dcf80..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java
+++ /dev/null
@@ -1,53 +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.jst.j2ee.internal.plugin;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-public class J2EEViewerSorter extends ViewerSorter {
-
- /**
- * Constructor for J2EEViewerSorter.
- */
- public J2EEViewerSorter() {
- super();
- }
-
-
-
- /**
- * @see ViewerSorter#compare(Viewer, Object, Object)
- */
- public int compare(Viewer viewer, Object e1, Object e2) {
- if (shouldSort(e1, e2))
- return super.compare(viewer, e1, e2);
- return 0;
- }
-
- protected boolean isEnterpriseBean(Object o) {
- return o instanceof EnterpriseBean;
- }
-
- protected boolean isDeploymentDescriptorRoot(Object o) {
- return CommonUtil.isDeploymentDescriptorRoot(o);
- }
-
- protected boolean shouldSort(Object e1, Object e2) {
- return (isDeploymentDescriptorRoot(e1) && isDeploymentDescriptorRoot(e2)) || (isEnterpriseBean(e1) && isEnterpriseBean(e2)) || ((e1 instanceof IFile) && (e2 instanceof IFile));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java
deleted file mode 100644
index cad6e8f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java
+++ /dev/null
@@ -1,213 +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
- *******************************************************************************/
-/*
- * Created on Feb 2, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * @author mdelder
- */
-public class UIProjectUtilities {
-
- /**
- * @param selection
- * The current selection
- * @return The first project (regardless of nature) in the selection
- */
- public static IProject getSelectedProject(IStructuredSelection selection) {
- return getSelectedProject(selection, (String) null);
- }
-
- /**
- * @param selection
- * The current selection
- * @param expectedNatureId
- * The required Nature ID
- * @return The first project, only if the first project has the given nature
- */
- public static IProject getSelectedProject(IStructuredSelection selection, String expectedNatureId) {
-
- if (selection != null && !selection.isEmpty()) {
- if (ResourcesPlugin.getWorkspace().getRoot().getProjects().length == 0)
- return null;
- Object obj = selection.getFirstElement();
- IProject project = null;
- if (obj instanceof IProject)
- project = (IProject) obj;
- else if (obj instanceof IAdaptable)
- project = (IProject) ((IAdaptable) obj).getAdapter(IProject.class);
- else if (obj instanceof EObject)
- project = ProjectUtilities.getProject((EObject) obj);
- else if (obj instanceof ItemProvider) {
- Object temp = ((ItemProvider) obj).getParent(EObject.class);
- if (temp != null && temp instanceof EObject)
- project = ProjectUtilities.getProject((EObject) temp);
- }
-
- if (project != null && expectedNatureId != null) {
- try {
- if (project.hasNature(expectedNatureId))
- return project;
- } catch (CoreException e) {
- return null;
- }
- } else
- return project;
- }
- return null;
- }
-
- /**
- *
- * @param selection
- * The current selection
- * @param possibleNatureIds
- * A list of possible nature ids
- * @return The first project selected, only if it has AT LEAST ONE of the possible nature ids
- */
- public static IProject getSelectedProject(IStructuredSelection selection, String[] possibleNatureIds) {
- if (selection != null && !selection.isEmpty()) {
- Object obj = selection.getFirstElement();
- IProject project = null;
- if (obj instanceof IProject)
- project = (IProject) obj;
- else if (obj instanceof IAdaptable)
- project = (IProject) ((IAdaptable) obj).getAdapter(IProject.class);
- else if (obj instanceof EObject)
- project = ProjectUtilities.getProject((EObject) obj);
-
- if (project != null && possibleNatureIds != null && possibleNatureIds.length > 0) {
- try {
- for (int i = 0; i < possibleNatureIds.length; i++)
- if (project.hasNature(possibleNatureIds[i]))
- return project;
- } catch (CoreException e) {
- return null;
- }
- } else
- return project;
- }
- return null;
- }
-
- /**
- *
- * @param selection
- * The current selection
- * @return All selected Projects, regardless of nature
- */
- public static IProject[] getAllSelectedProjects(IStructuredSelection selection) {
- return getAllSelectedProjects(selection, (String) null);
- }
-
- /**
- *
- * @param selection
- * The current selection
- * @param expectedNatureId
- * The expected nature id
- * @return All selected Projects which have the expected nature id
- */
- public static IProject[] getAllSelectedProjects(IStructuredSelection selection, String expectedNatureId) {
- if (selection != null && !selection.isEmpty()) {
- Object obj = null;
- List projects = new ArrayList();
- Iterator selectionIterator = selection.iterator();
- while (selectionIterator.hasNext()) {
- obj = selectionIterator.next();
- IProject project = null;
- if (obj instanceof IProject)
- project = (IProject) obj;
- else if (obj instanceof IAdaptable)
- project = (IProject) ((IAdaptable) obj).getAdapter(IProject.class);
- else if (obj instanceof EObject)
- project = ProjectUtilities.getProject((EObject) obj);
-
- if (project != null && expectedNatureId != null) {
- try {
-
- if (project.hasNature(expectedNatureId))
- projects.add(project);
-
- } catch (CoreException e) {
- //Ignore
- }
- } else
- projects.add(project);
- }
- IProject[] finalProjects = new IProject[projects.size()];
- projects.toArray(finalProjects);
- return finalProjects;
- }
- return new IProject[0];
- }
-
-
- /**
- *
- * @param selection
- * The current selection
- * @param possibleNatureIds
- * a list of possible nature ids
- * @return All selected Projects which have AT LEAST ONE of the given nature ids
- */
- public static IProject[] getAllSelectedProjects(IStructuredSelection selection, String[] possibleNatureIds) {
- if (selection != null && !selection.isEmpty()) {
- Object obj = null;
- List projects = new ArrayList();
- Iterator selectionIterator = selection.iterator();
- while (selectionIterator.hasNext()) {
- obj = selectionIterator.next();
- IProject project = null;
- if (obj instanceof IProject)
- project = (IProject) obj;
- else if (obj instanceof IAdaptable)
- project = (IProject) ((IAdaptable) obj).getAdapter(IProject.class);
- else if (obj instanceof EObject)
- project = ProjectUtilities.getProject((EObject) obj);
-
- if (project != null && possibleNatureIds != null && possibleNatureIds.length > 0) {
- try {
- for (int i = 0; i < possibleNatureIds.length; i++)
- if (project.hasNature(possibleNatureIds[i]))
- projects.add(project);
-
- } catch (CoreException e) {
- //Ignore
- }
- } else
- projects.add(project);
- }
- IProject[] finalProjects = new IProject[projects.size()];
- projects.toArray(finalProjects);
- return finalProjects;
- }
- return new IProject[0];
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java
deleted file mode 100644
index f71fc30..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java
+++ /dev/null
@@ -1,131 +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.jst.j2ee.internal.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBJarItemProvider;
-
-
-public class J2EEAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
- protected MethodsProviderDelegate methodsProviderDelegate;
- protected static final Class ITreeItemContentProviderClass = ITreeItemContentProvider.class;
- protected List roots = new ArrayList();
-
- /**
- * J2EEAdapterFactoryContentProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EEAdapterFactoryContentProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- methodsProviderDelegate = new MethodsProviderDelegate(adapterFactory);
- }
-
- public Object getParent(Object object) {
-
- if (MethodsProviderDelegate.providesContentFor(object))
- return methodsProviderDelegate.getParent(object);
-
- //Added so internalExpand() in AbstractTreeViewer knows that EJB's parent is now instance
- // of J2EEItemProvider
- //rather than EJBJar only if bean is root bean
- if (object instanceof EnterpriseBean && GroupedEJBJarItemProvider.isRootBean((EnterpriseBean) object)) {
- J2EEItemProvider provider = GroupedEJBJarItemProvider.getEJBItemProvider((EnterpriseBean) object);
- if (provider != null) {
- return provider;
- }
- }
-
- Object parent = super.getParent(object);
-
- // if (parent == null) {
- // if (object instanceof EObject)
- // return J2EERoot.instance().groupFor((EObject) object);
- // }
- return parent;
- }
-
- protected boolean isEMFEditObject(Object object) {
- ITreeItemContentProvider treeItemContentProvider = (ITreeItemContentProvider) adapterFactory.adapt(object, ITreeItemContentProviderClass);
- return treeItemContentProvider != null;
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentElement) {
-
- if (MethodsProviderDelegate.providesContentFor(parentElement))
- return methodsProviderDelegate.getChildren(parentElement);
- else if (isEMFEditObject(parentElement))
- return super.getChildren(parentElement);
- else
- return null;
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object inputElement) {
- return getRoots(inputElement);
- // else if (MethodsProviderDelegate.providesContentFor(inputElement))
- // return methodsProviderDelegate.getChildren(inputElement);
- // return super.getElements(inputElement);
- }
-
- public Object[] getRoots(Object parent) {
- if (roots.isEmpty()) {
- Object[] j2eeGroups = super.getChildren(parent);
- roots.addAll(Arrays.asList(j2eeGroups));
- }
- return roots.toArray();
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- if (MethodsProviderDelegate.providesContentFor(element))
- return methodsProviderDelegate.hasChildren(element);
- else if (isEMFEditObject(element))
- return super.hasChildren(element);
- else
- return false;
- }
-
- /**
- * @see IContentProvider#dispose()
- */
- public void dispose() {
- super.dispose();
- if (methodsProviderDelegate != null)
- methodsProviderDelegate.dispose();
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- super.inputChanged(aViewer, oldInput, newInput);
- methodsProviderDelegate.inputChanged(aViewer, oldInput, newInput);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java
deleted file mode 100644
index 76d0c0f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java
+++ /dev/null
@@ -1,90 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 10:40:41 PM)
- *
- * @author: Administrator
- */
-public class J2EEAdapterFactoryLabelProvider extends AdapterFactoryLabelProvider {
- // //$NON-NLS-1$
- protected static final Class IItemLabelProviderClass = IItemLabelProvider.class;
- private static final EStructuralFeature ROLE_NAME_SF = CommonPackage.eINSTANCE.getSecurityRole_RoleName();
- private static final EStructuralFeature ROLES_SF = EjbFactoryImpl.getPackage().getMethodPermission_Roles();
-
-
- /**
- * This is used for delegation to get labels for server objects, which don't fit into EMF edit
- */
- protected WorkbenchLabelProvider wbLabelProvider;
-
- public J2EEAdapterFactoryLabelProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- wbLabelProvider = new WorkbenchLabelProvider();
- }
-
- public Image getImage(Object object) {
- if (object instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) object).getImage();
- else if (isEMFEditObject(object))
- return super.getImage(object);
- else if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return super.getImage(((AbstractMethodsContentProvider.EJBMethodItem) object).ejb);
- return wbLabelProvider.getImage(object);
- }
-
- public String getText(Object object) {
-
- if (object instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) object).getText();
- else if (isEMFEditObject(object)) {
- if (CommonUtil.isDeploymentDescriptorRoot(object))
- return J2EEUIMessages.getResourceString("Deployment_Descriptor_UI_") + ": " + super.getText(object); //$NON-NLS-1$ //$NON-NLS-2$
- return super.getText(object);
- } else if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return super.getText(((AbstractMethodsContentProvider.EJBMethodItem) object).ejb);
- else if (object instanceof IFile) {
- return ((IFile) object).getProjectRelativePath().toString();
- }
- return wbLabelProvider.getText(object);
- }
-
- protected boolean isEMFEditObject(Object object) {
- IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProviderClass);
- return itemLabelProvider != null;
- }
-
- /*
- * @see INotifyChangedListener#notifyChanged(new ENotificationImpl((InternalEObject)Object,
- * int,(EStructuralFeature) Object, Object, Object, int))
- */
- public void notifyChanged(Notification notification) {
- Object feature = notification.getFeature();
- if (feature == ROLE_NAME_SF || feature == ROLES_SF)
- fireLabelProviderChanged();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java
deleted file mode 100644
index dfe361c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java
+++ /dev/null
@@ -1,194 +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.jst.j2ee.internal.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationFactoryImpl;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EENotificationImpl;
-
-public class J2EEApplicationItemProvider extends ApplicationItemProvider implements IAdaptable {
-
- protected static final Class IRESOURCE_CLASS = IResource.class;
- protected static final Class IPROJECT_CLASS = IProject.class;
-
- protected Map children = new HashMap();
- protected List resourceAdapters = null;
-
- /**
- * Constructor for J2EEApplicationItemProvider.
- *
- * @param adapterFactory
- */
- public J2EEApplicationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * @see ItemProviderAdapter#getChildren(Object)
- */
- public Collection getChildren(Object object) {
- List localChildren = (List) children.get(object);
- if (localChildren == null)
- return initChildren(object);
- return localChildren;
- }
-
- protected List initChildren(Object object) {
- Application app = (Application) object;
- List localChildren = new ArrayList(2);
- // MDE: changed getParent(object) to just app
- localChildren.add(new ModulesItemProvider(getAdapterFactory(), null, null, app, app.getModules()));
-
-// IProject project = ProjectUtilities.getProject(app);
-// IVirtualComponent ear = ComponentUtilities.findComponent(app);
- //TODO switch to retrieve referenceComponents
-// EAREditModel editModel = null;
-// try {
-// EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
-// if (runtime != null) {
-// editModel = runtime.getEarEditModelForRead(this);
-// EARProjectMap map = editModel.getEARProjectMap();
-// localChildren.add(map);
-// map.eResource().eAdapters().add(getNewAdapter(app));
-// }
-// } finally {
-// if (editModel != null)
-// editModel.releaseAccess(this);
-// }
- localChildren.add(new J2EEUtilityJarItemProvider(app, getAdapterFactory(), this));
-
- children.put(object, localChildren);
- return localChildren;
- }
-
- protected ModulesItemProvider getModulesNode(Object object) {
- return (ModulesItemProvider) ((List) getChildren(object)).get(0);
- }
-
-
- /**
- * @see Adapter#notifyChanged(new ENotificationImpl((InternalEObject)Notifier,
- * int,(EStructuralFeature) EObject, Object, Object, int))
- * @deprecated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Application.class)) {
- case ApplicationPackage.APPLICATION__MODULES :
- break;
- default :
- super.notifyChanged(notification);
- }
- if (notification.getEventType() == Notification.REMOVING_ADAPTER && notification.getOldValue() == this)
- children.remove(notification.getNotifier());
- else if (notification.getFeature() == ApplicationFactoryImpl.getPackage().getApplication_Modules())
- modulesChanged((Application) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
- }
-
- protected void modulesChanged(Application app, int eventType, Object oldValue, Object newValue, int pos) {
- ModulesItemProvider provider = getModulesNode(app);
- Collection grandChildren = provider.getChildren();
- switch (eventType) {
- case Notification.ADD : {
- grandChildren.add(newValue);
- break;
- }
- case Notification.ADD_MANY : {
- grandChildren.addAll((Collection) newValue);
- break;
- }
- case Notification.REMOVE : {
- grandChildren.remove(oldValue);
- break;
- }
- case Notification.REMOVE_MANY : {
- grandChildren.removeAll((Collection) oldValue);
- break;
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#dispose()
- */
- public void dispose() {
- super.dispose();
- List adapters = getResourceAdapters();
- ResourceAdapter adapter = null;
- for (int i = 0; i < adapters.size(); i++) {
- adapter = (ResourceAdapter) adapters.get(i);
- adapter.getTarget().eAdapters().remove(adapter);
- }
- }
-
- protected class ResourceAdapter extends AdapterImpl {
-
- private Application app = null;
-
- public ResourceAdapter(Application app) {
- this.app = app;
- }
-
- public void notifyChanged(Notification notification) {
-
- Resource res = (Resource) notification.getNotifier();
- if (notification.getEventType() == Notification.SET && notification.getFeatureID(null) == Resource.RESOURCE__IS_LOADED && !res.isLoaded()) {
- J2EEApplicationItemProvider.this.children.remove(app);
- res.eAdapters().remove(ResourceAdapter.this);
- fireNotifyChanged(new J2EENotificationImpl(app, Notification.MOVE, (Object) null, (Object) null, 0));
-
- }
- }
- }
-
- protected ResourceAdapter getNewAdapter(Application key) {
- ResourceAdapter adapter = new ResourceAdapter(key);
- getResourceAdapters().add(adapter);
- return adapter;
- }
-
- /**
- * @return Returns the resourceAdapters.
- */
- protected List getResourceAdapters() {
- if (resourceAdapters == null)
- resourceAdapters = new ArrayList();
- return resourceAdapters;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java
deleted file mode 100644
index 0434b30..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,34 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProviderAdapterFactory;
-
-
-public class J2EEApplicationItemProviderAdapterFactory extends ApplicationItemProviderAdapterFactory {
-
- /**
- * Constructor for J2EEApplicationAdapterFactory.
- */
- public J2EEApplicationItemProviderAdapterFactory() {
- super();
- }
-
- /**
- * @see ApplicationAdapterFactory#createApplicationAdapter()
- */
- public Adapter createApplicationAdapter() {
- return new J2EEApplicationItemProvider(this);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java
deleted file mode 100644
index ab07bd1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java
+++ /dev/null
@@ -1,152 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.command.CreateCopyCommand;
-import org.eclipse.emf.edit.command.DragAndDropCommand;
-import org.eclipse.emf.edit.command.InitializeCopyCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.OverrideableCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.ReplaceCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-
-/**
- * Custom editing domain which provides hooks for creating override commands; should not be used
- * directly but can be subclassed to override commands as necessary. All the override methods by
- * default return null, so a subclass may override only a subset of the commands.
- */
-public class J2EEEditingDomain extends AdapterFactoryEditingDomain {
- /**
- * J2EEEditingDomain constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- * @param commandStack
- * CommandStack
- */
- public J2EEEditingDomain(org.eclipse.emf.common.notify.AdapterFactory adapterFactory, CommandStack commandStack) {
- super(adapterFactory, commandStack);
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createAddOverrideCommand(AddCommand addCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createCopyToClipboardOverrideCommand(CopyToClipboardCommand copyToClipboardCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createCreateCopyOverrideCommand(CreateCopyCommand createCopyCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createDragAndDropOverrideCommand(DragAndDropCommand dragAndDropCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createInitializeCopyOverrideCommand(InitializeCopyCommand initializeCopyCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createMoveOverrideCommand(MoveCommand moveCommand) {
- return null;
- }
-
- public Command createOverrideCommand(OverrideableCommand command) {
- if (command instanceof AddCommand) {
- AddCommand addCommand = (AddCommand) command;
- return createAddOverrideCommand(addCommand);
- } else if (command instanceof RemoveCommand) {
- RemoveCommand removeCommand = (RemoveCommand) command;
- return createRemoveOverrideCommand(removeCommand);
- } else if (command instanceof SetCommand) {
- SetCommand setCommand = (SetCommand) command;
- return createSetOverrideCommand(setCommand);
- } else if (command instanceof ReplaceCommand) {
- ReplaceCommand replaceCommand = (ReplaceCommand) command;
- return createReplaceOverrideCommand(replaceCommand);
- } else if (command instanceof MoveCommand) {
- MoveCommand moveCommand = (MoveCommand) command;
- return createMoveOverrideCommand(moveCommand);
- } else if (command instanceof CreateCopyCommand) {
- CreateCopyCommand createCopyCommand = (CreateCopyCommand) command;
- return createCreateCopyOverrideCommand(createCopyCommand);
- } else if (command instanceof InitializeCopyCommand) {
- InitializeCopyCommand initializeCopyCommand = (InitializeCopyCommand) command;
- return createInitializeCopyOverrideCommand(initializeCopyCommand);
- } else if (command instanceof CopyToClipboardCommand) {
- CopyToClipboardCommand copyToClipboardCommand = (CopyToClipboardCommand) command;
- return createCopyToClipboardOverrideCommand(copyToClipboardCommand);
- } else if (command instanceof PasteFromClipboardCommand) {
- PasteFromClipboardCommand pasteFromClipboardCommand = (PasteFromClipboardCommand) command;
- return createPasteFromClipboardOverrideCommand(pasteFromClipboardCommand);
- } else if (command instanceof DragAndDropCommand) {
- DragAndDropCommand dragAndDropCommand = (DragAndDropCommand) command;
- return createDragAndDropOverrideCommand(dragAndDropCommand);
- } else {
- return null;
- }
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createPasteFromClipboardOverrideCommand(PasteFromClipboardCommand pasteFromClipboardCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createRemoveOverrideCommand(RemoveCommand removeCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createReplaceOverrideCommand(ReplaceCommand replaceCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createSetOverrideCommand(SetCommand setCommand) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEModulemapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEModulemapItemProviderAdapterFactory.java
deleted file mode 100644
index 4d620b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEModulemapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,32 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-
-public class J2EEModulemapItemProviderAdapterFactory extends ModulemapItemProviderAdapterFactory {
-
- /**
- * Constructor for J2EEModulemapItemProviderAdapterFactory.
- */
- public J2EEModulemapItemProviderAdapterFactory() {
- super();
- }
-
- /**
- * @see ModulemapAdapterFactory#createEARProjectMapAdapter()
- */
- public Adapter createEARProjectMapAdapter() {
- return new J2EEUtilityJavaProjectsItemProvider(this, false);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java
deleted file mode 100644
index 3839ba3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java
+++ /dev/null
@@ -1,38 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-public class J2EEProviderUtility {
-
- private J2EEProviderUtility() {
- super();
- }
-
- public static String prependProjectName(EObject object, String label) {
- String projectName = null;
- if (object.eResource() != null) {
- IProject proj = WorkbenchResourceHelper.getProject(object.eResource());
- if (proj != null)
- projectName = proj.getName();
- }
-
- if (projectName == null || projectName.equals(label))
- return label;
- else if (label == null || label.length() == 0)
- return projectName;
- else
- return projectName + ": " + label; //$NON-NLS-1$
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java
deleted file mode 100644
index 4ce6309..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java
+++ /dev/null
@@ -1,73 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EEClipboard;
-import org.eclipse.jst.j2ee.internal.command.J2EECopyToClipboardOverrideCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EEPasteFromClipboardOverrideCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EERemoveOverrideCommand;
-
-
-public class J2EEUIEditingDomain extends J2EEEditingDomain {
- /**
- * J2EEUIEditingDomain constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- * @param commandStack
- * CommandStack
- */
- public J2EEUIEditingDomain(org.eclipse.emf.common.notify.AdapterFactory adapterFactory, CommandStack commandStack) {
- super(adapterFactory, commandStack);
- turnTraceOnIfDebugging();
- }
-
- protected Command createCopyToClipboardOverrideCommand(CopyToClipboardCommand copyToClipboardCommand) {
-
- if (copyToClipboardCommand instanceof J2EECopyToClipboardOverrideCommand)
- return null;
- return new J2EECopyToClipboardOverrideCommand(copyToClipboardCommand);
- }
-
- protected Command createPasteFromClipboardOverrideCommand(PasteFromClipboardCommand pasteFromClipboardCommand) {
- if (pasteFromClipboardCommand instanceof J2EEPasteFromClipboardOverrideCommand)
- return null;
- if (!(getClipboard() instanceof J2EEClipboard))
- return null;
- return new J2EEPasteFromClipboardOverrideCommand(pasteFromClipboardCommand);
- }
-
- protected Command createRemoveOverrideCommand(RemoveCommand removeCommand) {
- return new J2EERemoveOverrideCommand(removeCommand);
- }
-
- public J2EEClipboard getJ2EEClipboard() {
- return (J2EEClipboard) getClipboard();
- }
-
- public Object getParent(Object object) {
- Object parent = super.getParent(object);
- if (parent != null)
- return parent;
- if (object instanceof EObject)
- return ((EObject) object).eContainer();
- return null;
- }
-
- protected void turnTraceOnIfDebugging() {
- //AbstractCommand.Trace.enable();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
deleted file mode 100644
index 4fdfb86..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
+++ /dev/null
@@ -1,286 +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.jst.j2ee.internal.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-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.IVirtualReference;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class J2EEUtilityJarItemProvider extends J2EEItemProvider {
-
- public final static String UTILITY_JARS = J2EEUIMessages.getResourceString("Utility_JARs_UI_"); //$NON-NLS-1$
-
- private boolean childrenLoaded = false;
- private Application application = null;
-
- /**
- * Constructor for J2EEUtilityJarItemProvider.
- */
- public J2EEUtilityJarItemProvider(Application app, AdapterFactory adapterFactory, Object parent) {
- super(adapterFactory);
- setParent(parent);
- application = app;
- UtilityJarResourceChangeListener.INSTANCE.addUtilityJarItemProvider(ProjectUtilities.getProject(application), this);
- }
-
- public boolean hasChildren(Object object) {
- getChildren(object);
- return !children.isEmpty();
- }
-
- public Collection getChildren(final Object object) {
- if (!childrenLoaded) {
- try {
- disableNotification();
- org.eclipse.swt.custom.BusyIndicator.showWhile(null, new Runnable() {
- public void run() {
- computeChildren();
- }
- });
- } finally {
- enableNotification();
- }
- }
- return children;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#dispose()
- */
- public void dispose() {
- super.dispose();
- UtilityJarResourceChangeListener.INSTANCE.removeUtilityJarItemProvider(ProjectUtilities.getProject(application), this);
-
- }
-
- /**
- * @see ItemProvider#getChildren(Object)
- */
- private void computeChildren() {
- childrenLoaded = true;
- IVirtualComponent ear = ComponentUtilities.findComponent(application);
- if (ear!=null) {
- IVirtualReference[] modules = ear.getReferences();
- for (int i=0; i<modules.length; i++) {
- IVirtualComponent module = modules[i].getReferencedComponent();
- if (module.getProject() == null || !module.getProject().isAccessible())
- continue;
- // return only jars for utility components
- if (J2EEProjectUtilities.isUtilityProject(module.getProject())) {
- IProject project = ProjectUtilities.getProject(application);
- if (project == null)
- continue;
- // we will assume the component name is in synch with the module uri
- IFile utilityJar = project.getFile(module.getName()+".jar"); //$NON-NLS-1$
- if (utilityJar !=null)
- children.add(utilityJar);
- }
- if (module.isBinary()) {
- java.io.File diskFile = ((VirtualArchiveComponent) module).getUnderlyingDiskFile();
- if (diskFile.exists())
- children.add(diskFile);
- else {
- // we will assume the component name is in synch with the module uri
- IFile utilityJar = ((VirtualArchiveComponent)module).getUnderlyingWorkbenchFile();
- if (utilityJar !=null)
- children.add(utilityJar);
- }
- }
- }
- }
- }
-
-// private Collection getJars(List list, IResource[] members) {
-// for (int i = 0; i < members.length; i++) {
-// if (isJarFile(members[i])) {
-// list.add(members[i]);
-// } else if (members[i].getType() == IResource.FOLDER) {
-// try {
-// getJars(list, ((IFolder) members[i]).members());
-// } catch (CoreException e) {
-// Logger.getLogger().logError(e);
-// }
-// }
-// }
-// return list;
-// }
-
- public static boolean isJarFile(IResource member) {
- return member.getType() == IResource.FILE && member.getName().toLowerCase().endsWith(".jar"); //$NON-NLS-1$
- }
-
- public static boolean isComponentFile(IResource member) {
- return member.getType() == IResource.FILE && member.getName().toLowerCase().endsWith(IModuleConstants.COMPONENT_FILE_NAME);
- }
-
- /**
- * @see ItemProviderAdapter#getImage(Object)
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
- }
-
- /**
- * @see ItemProviderAdapter#getText(Object)
- */
- public String getText(Object object) {
- return UTILITY_JARS;
- }
-
- // assume this resource is a jar resource
- public void utilityJarChanged(IResource resource, IResourceDelta delta) {
- if (childrenLoaded) {
- if (delta.getKind() == IResourceDelta.ADDED && !children.contains(resource)) {
- children.add(resource);
- } else if (delta.getKind() == IResourceDelta.REMOVED && children.contains(resource)) {
- children.remove(resource);
- }
- }
- }
-
- protected static class UtilityJarResourceChangeListener implements IResourceChangeListener, IResourceDeltaVisitor {
-
- protected static final UtilityJarResourceChangeListener INSTANCE = new UtilityJarResourceChangeListener();
-
- private boolean listening = false;
- private Map earProjectsToUtilityJarProviderMap;
-
- public void addUtilityJarItemProvider(IProject project, J2EEUtilityJarItemProvider utilityJarItemProvider) {
- List providers = getProviders(project);
- if (providers != null)
- providers.add(utilityJarItemProvider);
- if (!listening) {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- listening = true;
- }
- }
-
- /**
- * @param project
- * @return
- */
- private List getProviders(IProject project) {
- List result = (List) getEarProjectsToUtilityJarProviderMap().get(project);
- if (result == null && project != null)
- getEarProjectsToUtilityJarProviderMap().put(project, (result = new ArrayList()));
- return result;
- }
-
- /**
- * @return
- */
- private Map getEarProjectsToUtilityJarProviderMap() {
- if (earProjectsToUtilityJarProviderMap == null)
- earProjectsToUtilityJarProviderMap = new HashMap();
- return earProjectsToUtilityJarProviderMap;
- }
-
- public void removeUtilityJarItemProvider(IProject project, J2EEUtilityJarItemProvider utilityJarItemProvider) {
- List providers = getProviders(project);
- providers.remove(utilityJarItemProvider);
- if (providers.isEmpty())
- getEarProjectsToUtilityJarProviderMap().remove(project);
-
- if (getEarProjectsToUtilityJarProviderMap().isEmpty()) {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- listening = false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- try {
- event.getDelta().accept(this);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) {
- switch (delta.getResource().getType()) {
- case IResource.ROOT :
- case IResource.FOLDER :
- return true;
-
- case IResource.PROJECT :
- return getEarProjectsToUtilityJarProviderMap().containsKey(delta.getResource());
- case IResource.FILE : {
- IResource resource = delta.getResource();
- if (isComponentFile(resource)) {
- List utilityJarItemProviders = getProviders(resource.getProject());
- for (int i = 0; i < utilityJarItemProviders.size(); i++) {
- ((J2EEUtilityJarItemProvider) utilityJarItemProviders.get(i)).getChildren().clear();
- ((J2EEUtilityJarItemProvider) utilityJarItemProviders.get(i)).computeChildren();
- }
- }
- return false;
- }
-
- }
- return false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IRESOURCE_CLASS || adapter == IPROJECT_CLASS)
- return (application != null) ? ProjectUtilities.getProject(application) : null;
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java
deleted file mode 100644
index 7a2fe62..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.internal.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public class J2EEUtilityJavaProjectsItemProvider extends EARProjectMapItemProvider {
-
- public final static String UTILITY_JAVA_PROJECTS = J2EEUIMessages.getResourceString("Utility_Java_Projects_UI_"); //$NON-NLS-1$
-
- /**
- * Constructor for UtilityJARsItemProvider.
- *
- * @param adapterFactory
- */
- public J2EEUtilityJavaProjectsItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * Constructor for UtilityJARsItemProvider.
- *
- * @param adapterFactory
- * @param includeModules
- */
- public J2EEUtilityJavaProjectsItemProvider(AdapterFactory adapterFactory, boolean includeModules) {
- super(adapterFactory, includeModules);
- }
-
- /**
- * @see ItemProviderAdapter#getImage(Object)
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
- }
-
- /**
- * @see ItemProviderAdapter#getText(Object)
- */
- public String getText(Object object) {
- return UTILITY_JAVA_PROJECTS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java
deleted file mode 100644
index 1200806..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java
+++ /dev/null
@@ -1,119 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.ExcludeListContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.MethodPermissionsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.MethodTransactionContentProvider;
-
-
-public class MethodsProviderDelegate implements ITreeContentProvider {
-
- protected ExcludeListContentProvider excludeListContentProvider;
- protected MethodPermissionsContentProvider methodPermissionsContentProvider;
- protected MethodTransactionContentProvider methodTransactionContentProvider;
-
- protected static EObject EL_META = EjbFactoryImpl.getPackage().getExcludeList();
- protected static EObject MP_META = EjbFactoryImpl.getPackage().getMethodPermission();
- protected static EObject MT_META = EjbFactoryImpl.getPackage().getMethodTransaction();
-
- public static boolean providesContentFor(Object object) {
- return object instanceof AbstractMethodsContentProvider.EJBMethodItem || object instanceof MethodPermission || object instanceof MethodTransaction || object instanceof ExcludeList;
- }
-
- public MethodsProviderDelegate(AdapterFactory adapterFactory) {
- super();
- excludeListContentProvider = new ExcludeListContentProvider(adapterFactory, false);
- methodPermissionsContentProvider = new MethodPermissionsContentProvider(adapterFactory, false);
- methodTransactionContentProvider = new MethodTransactionContentProvider(adapterFactory, false);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- if (excludeListContentProvider != null)
- excludeListContentProvider.dispose();
- if (methodPermissionsContentProvider != null)
- methodPermissionsContentProvider.dispose();
- if (methodTransactionContentProvider != null)
- methodTransactionContentProvider.dispose();
- }
-
- public AbstractMethodsContentProvider getContentProvider(Object object) {
- EObject metaClass = null;
- if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
- metaClass = ((AbstractMethodsContentProvider.EJBMethodItem) object).refObject.eClass();
- else
- metaClass = ((EObject) object).eClass();
-
- if (metaClass == EL_META)
- return excludeListContentProvider;
- else if (metaClass == MP_META)
- return methodPermissionsContentProvider;
- else if (metaClass == MT_META)
- return methodTransactionContentProvider;
-
- return null;
- }
-
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- excludeListContentProvider.inputChanged(viewer, oldInput, newInput);
- methodPermissionsContentProvider.inputChanged(viewer, oldInput, newInput);
- methodTransactionContentProvider.inputChanged(viewer, oldInput, newInput);
- }
-
- /**
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentElement) {
- AbstractMethodsContentProvider prov = getContentProvider(parentElement);
- return prov == null ? null : prov.getChildren(parentElement);
- }
-
- /**
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
- */
- public Object getParent(Object element) {
- AbstractMethodsContentProvider prov = getContentProvider(element);
- return prov == null ? null : prov.getParent(element);
- }
-
- /**
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- AbstractMethodsContentProvider prov = getContentProvider(element);
- return prov != null && prov.hasChildren(element);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object inputElement) {
- AbstractMethodsContentProvider prov = getContentProvider(inputElement);
- return prov == null ? null : prov.getElements(inputElement);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
deleted file mode 100644
index 9e94066..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
+++ /dev/null
@@ -1,224 +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.jst.j2ee.internal.provider;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public class ModulesItemProvider extends J2EEItemProvider {
- public static final String MODULES = J2EEUIMessages.getResourceString("Modules_UI_"); //$NON-NLS-1$
-
- /**
- * Constructor for ModulesItemProvider.
- */
- public ModulesItemProvider() {
- super();
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param children
- */
- public ModulesItemProvider(Collection children) {
- super(children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- */
- public ModulesItemProvider(String text) {
- super(text);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param children
- */
- public ModulesItemProvider(String text, Collection children) {
- super(text, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- */
- public ModulesItemProvider(String text, Object image) {
- super(text, image);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- * @param children
- */
- public ModulesItemProvider(String text, Object image, Collection children) {
- super(text, image, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- * @param parent
- */
- public ModulesItemProvider(String text, Object image, Object parent) {
- super(text, image, parent);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- * @param parent
- * @param children
- */
- public ModulesItemProvider(String text, Object image, Object parent, Collection children) {
- super(text, image, parent, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- */
- public ModulesItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text) {
- super(adapterFactory, text);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image) {
- super(adapterFactory, text, image);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param parent
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent) {
- super(adapterFactory, text, image, parent);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, Collection children) {
- super(adapterFactory, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Collection children) {
- super(adapterFactory, text, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Collection children) {
- super(adapterFactory, text, image, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param parent
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
-
- /**
- * @see ItemProviderAdapter#getImage(Object)
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
- }
-
- public Application getParentApplication() {
- return (Application) getParent();
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.provider.J2EEItemProvider#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IRESOURCE_CLASS || adapter == IPROJECT_CLASS)
- return ProjectUtilities.getProject(getParentApplication());
- return super.getAdapter(adapter);
- }
-
-
- /**
- * @see IItemLabelProvider#getText(Object)
- */
- public String getText(Object object) {
- return MODULES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java
deleted file mode 100644
index 3e603db..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.eclipse.jst.j2ee.internal.ui;
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2002 - All
- * Rights Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-import java.util.StringTokenizer;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEPropertiesConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.internal.operation.IWebProjectPropertiesUpdateDataModelProperties;
-import org.eclipse.wst.web.internal.operation.WebProjectPropertiesUpdateDataModelProvider;
-
-
-/**
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of
- * type comments go to Window>Preferences>Java>Code Generation.
- */
-public class J2EEPropertiesPage extends PropertyPage implements J2EEPropertiesConstants {
- private int newSelectedIndex;
- protected IProject project = null;
- private static final int SIZING_TEXT_FIELD_WIDTH = 250;
- Text contextRootNameField, webContentFolderField;
-
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- Control control = null;
- project = getProject();
- if (project != null) {
- Composite containerGroup = new Composite(parent, SWT.NONE );
- control = containerGroup;
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
-
- containerGroup.setLayout(layout);
-
- fillInformation(project, containerGroup);
- }
- return control;
- }
-
- private void fillInformation(IProject p, Composite c) {
- try {
- if( J2EEProjectUtilities.getJ2EEProjectType(p).equals( J2EEProjectUtilities.DYNAMIC_WEB) ||
- J2EEProjectUtilities.getJ2EEProjectType(p).equals( J2EEProjectUtilities.STATIC_WEB) ){
- fillContextRoot(p,c);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
-
- /**
- * @param p
- * @param c
- */
-
- private void fillContextRoot(IProject p, Composite c) {
- Label contextRootLabel = new Label(c, SWT.NULL);
- contextRootLabel.setText(J2EEPropertiesConstants.WEB_CONTEXT_ROOT);
- GridData data = new GridData();
- data.horizontalIndent = 15;
- contextRootLabel.setLayoutData(data);
-
- contextRootNameField = new Text(c, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- contextRootNameField.setLayoutData(data);
- contextRootNameField.setEditable(true);
-
- String s = J2EEProjectUtilities.getServerContextRoot(p);
- contextRootNameField.setText(s);
-
- contextRootNameField.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String newContextRoot = contextRootNameField.getText();
- validateContextRoot(newContextRoot);
- }
- });
-
-
- }
-
-
- private IProject getProject() {
- if (project == null) {
- Object element = getElement();
- if (element == null) {
- return null;
- }
- if (element instanceof IProject) {
- project = (IProject)element;
- return project;
- }
- return null;
- }
- return project;
- }
-
- /**
- * @return
- */
- private String getContextRoot() {
- return (contextRootNameField != null) ? contextRootNameField.getText() : null;
- }
-
- protected boolean hasUpdatedInformation() {
- return hasContextRootChanged();
-
- }
-
- private boolean hasContextRootChanged() {
- String oldContextRoot = J2EEProjectUtilities.getServerContextRoot( project );
- if (oldContextRoot == null) return true;
- return !oldContextRoot.equals(getContextRoot());
- }
-
-
-
- protected void performDefaults() {
- super.performDefaults();
-
- if (this.contextRootNameField != null)
- contextRootNameField.setText(J2EEProjectUtilities.getServerContextRoot(project));
-
- }
-
-
-
-
- public boolean performOk() {
- boolean retVal = true;
-
- IDataModel model = DataModelFactory.createDataModel( new WebProjectPropertiesUpdateDataModelProvider());
- model.setProperty( IWebProjectPropertiesUpdateDataModelProperties.PROJECT, project );
- model.setStringProperty( IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT, getContextRoot() );
- try {
- model.getDefaultOperation().execute( new NullProgressMonitor(), null );
- } catch (ExecutionException e) {
- Logger.getLogger().logError( e );
- }
- return retVal;
- }
-
-
-
- public void validateContextRoot(String name) {
- boolean bValid = true;
- if (name == null || name.length() ==0 ) { //$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
- this.setErrorMessage(ProjectSupportResourceHandler.getString("Context_Root_cannot_be_empty_2", new Object[0]));
- bValid = false;
- }
-
- 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)) == false) {
- this.setErrorMessage( ProjectSupportResourceHandler.getString("The_character_is_invalid_in_a_context_root" , new Object[] {(new Character(token.charAt(i))).toString()}));
- bValid = false;
- }
- }
- }
- }
- } // en/ end of if(name.trim
- else {
- this.setErrorMessage(ProjectSupportResourceHandler.getString("Names_cannot_begin_or_end_with_whitespace_5", new Object[0]));
- bValid = false;
- }
- if (bValid) this.setErrorMessage(null);
- this.setValid(bValid);
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java
deleted file mode 100644
index 5722db0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java
+++ /dev/null
@@ -1,119 +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
- *******************************************************************************/
-/*
- * Created on Aug 18, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.ui.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerHelper;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Add overlay for annotated objects
- */
-public class AnnotationIconDecorator extends LabelProvider implements ILightweightLabelDecorator {
-
- protected static final String ANNOTATION_IMAGE_DESC_STRING = "annotation_bean_overlay"; //$NON-NLS-1$
- protected static final String ANNOTATION_DISABLED_IMAGE_DESC_STRING = "dis_annotation_bean_overlay"; //$NON-NLS-1$
- private static final ImageDescriptor ANNOTATION_IMG_DESC = getImageDescriptor(ANNOTATION_IMAGE_DESC_STRING);
- private static final ImageDescriptor ANNOTATION_DISABLED_IMG_DESC = getImageDescriptor(ANNOTATION_DISABLED_IMAGE_DESC_STRING);
-
- public AnnotationIconDecorator() {
- super();
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object,
- * org.eclipse.jface.viewers.IDecoration)
- */
- private boolean isAnnotatedSupported(EObject target) {
- boolean bAnnotationSupported = false;
- if (AnnotationsControllerHelper.INSTANCE.isAnnotated(target)) {
- bAnnotationSupported = true;
- }
- return bAnnotationSupported;
- }
-
- private AnnotationsController getControllerForProject(IProject targetProject) {
- AnnotationsController controller = AnnotationsControllerManager.INSTANCE.getAnnotationsController(targetProject);
- return controller;
- }
-
- public void decorate(Object element, IDecoration decoration) {
- EObject eObject = null;
- if (element instanceof BeanClassProviderHelper) {
- BeanClassProviderHelper beanClassHelper = (BeanClassProviderHelper) element;
- eObject = beanClassHelper.getEjb();
- } else if (element instanceof EnterpriseBean || element instanceof Servlet)
- eObject = (EObject) element;
- if (eObject == null)
- return;
- if (isAnnotatedSupported(eObject)) {
- if (isAnnotationEnabled(eObject)) {
- if (ANNOTATION_IMG_DESC != null)
- decoration.addOverlay(ANNOTATION_IMG_DESC);
- } else {
- if (ANNOTATION_DISABLED_IMG_DESC != null)
- decoration.addOverlay(ANNOTATION_DISABLED_IMG_DESC);
- }
- }
- }
-
- /**
- * @param bean
- * @return
- */
- private boolean isAnnotationEnabled(EObject eObject) {
- IFile annotatedSource = null;
- /* short circuit if possible */
- if (AnnotationsControllerManager.INSTANCE.isAnyAnnotationsSupported()) {
- IProject targetProject = ProjectUtilities.getProject(eObject);
- AnnotationsController controller = getControllerForProject(targetProject);
- if (controller != null)
- annotatedSource = controller.getEnabledAnnotationFile(eObject);
- }
- return (annotatedSource != null) ? true : false;
- }
-
- public Image decorateImage(Image image, Object element) {
- return image;
- }
-
- /**
- * @see ILabelDecorator#decorateText(String, Object)
- */
- public String decorateText(String text, Object element) {
- return text;
- }
-
- protected static ImageDescriptor getImageDescriptor(String imageFileName) {
- if (imageFileName != null)
- return J2EEUIPlugin.getDefault().getImageDescriptor(imageFileName);
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java
deleted file mode 100644
index 4205656..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java
+++ /dev/null
@@ -1,44 +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.jst.j2ee.internal.ui.util;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-
-public class BinaryProjectUIHelper {
-
- public static final String DIALOG_TITLE = J2EEUIMessages.getResourceString("BINARY_PROJECT"); //$NON-NLS-1$
- public static final String DIALOG_MESSAGE = J2EEUIMessages.getResourceString("ACTION_CANNOT_BE_PERFORMED_ON_BIN_PROJECT"); //$NON-NLS-1$
-
- /**
- * Constructor for BinaryProjectUIHelper.
- */
- public BinaryProjectUIHelper() {
- super();
- }
-
- public static void displayError(Shell parent) {
- MessageDialog.openError(parent, DIALOG_TITLE, DIALOG_MESSAGE);
- return;
- }
-
- public static boolean displayErrorIfBinaryProject(Shell parent, IProject aProject) {
- boolean isBinary = JemProjectUtilities.isBinaryProject(aProject);
- if (isBinary)
- displayError(parent);
- return isBinary;
- }
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
deleted file mode 100644
index c48e3af..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
+++ /dev/null
@@ -1,229 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationWrapper;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppItemProvider;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEWebAppItemProvider extends WebAppItemProvider {
-
- private List children = new ArrayList();
- private WebServletGroupItemProvider webServletGroup;
- private WebServletMappingGroupItemProvider webServletMappingGroup;
- private WebFiltersGroupItemProvider webFiltersGroup;
- private WebFilterMappingGroupItemProvider webFilterMappingGroup;
- private WebReferencesGroupItemProvider webRefsGroup;
- private WebSecurityGroupItemProvider webSecurityGroup;
- private J2EEWebServiceClientDDManager clientMgr;
- private WebListenerGroupItemProvider webListenerGroup;
-
- /**
- * Listen and fire updates for 1.3 web service clients
- */
- private class J2EEWebServiceClientDDManager extends AdapterImpl implements EditModelListener {
- private WeakReference weakWebApp;
- WebServicesClient client;
-
- public J2EEWebServiceClientDDManager(WeakReference weakWebApp) {
- this.weakWebApp = weakWebApp;
- init();
- }
-
-
-
- public void init() {
- // TODO fix up notification
- // editModel = webServiceMgr.getWSEditModel(ProjectUtilities.getProject(webApp));
- // if (editModel != null) {
- // editModel.addListener(this);
- // if (editModel.get13WebServicesClientResource() != null) {
- // client = editModel.get13WebServicesClientResource().getWebServicesClient();
- // if (client != null)
- // client.eAdapters().add(this);
- // }
- // }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- // TODO fix up notification
- // if (editModel == null)
- // init();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification notification) {
- if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
- if (notification.getFeatureID(WebServicesClient.class) == Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS) {
- NotificationWrapper notificationWrapper = new NotificationWrapper(webRefsGroup, notification);
- fireNotifyChanged(notificationWrapper);
- }
- }
- super.notifyChanged(notification);
- }
-
- public void dispose() {
- // TODO fix up notification
-
- webServletGroup.dispose();
- webServletMappingGroup.dispose();
- webFiltersGroup.dispose();
- webFilterMappingGroup.dispose();
- webRefsGroup.dispose();
- webSecurityGroup.dispose();
- webListenerGroup.dispose();
-
- weakWebApp = null;
- if (client != null)
- client.eAdapters().remove(this);
- children.clear();
-
- }
- }
-
- /**
- * Default constructor
- */
- public J2EEWebAppItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * initilaize list of children
- */
- private void initChildren() {
- if (clientMgr == null)
- clientMgr = new J2EEWebServiceClientDDManager(weakWebApp);
- children.add(webServletGroup = new WebServletGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webServletMappingGroup = new WebServletMappingGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webFiltersGroup = new WebFiltersGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webFilterMappingGroup = new WebFilterMappingGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webRefsGroup = new WebReferencesGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webSecurityGroup = new WebSecurityGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webListenerGroup = new WebListenerGroupItemProvider(adapterFactory, weakWebApp));
- }
-
- protected WeakReference weakWebApp = null;
-
- public Collection getChildren(Object object) {
- children.clear();
- if (object instanceof WebApp && children.isEmpty()) {
- weakWebApp = new WeakReference(object);
- initChildren();
- }
- if (object instanceof WebApp)
- weakWebApp = new WeakReference(object);
- return children;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification notification) {
- if (children == null || children.isEmpty())
- initChildren();
- // We only care about adds and removes for the different item provider
- // groups
- if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
- Object notifier = null;
- switch (notification.getFeatureID(WebApp.class)) {
- case WebapplicationPackage.WEB_APP__SERVLETS :
- notifier = webServletGroup;
- break;
- case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS :
- notifier = webServletMappingGroup;
- break;
- case WebapplicationPackage.WEB_APP__FILTERS :
- notifier = webFiltersGroup;
- break;
- case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS :
- notifier = webFilterMappingGroup;
- break;
- case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS :
- case WebapplicationPackage.WEB_APP__EJB_REFS :
- case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS :
- case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS :
- case WebapplicationPackage.WEB_APP__RESOURCE_REFS :
- case WebapplicationPackage.WEB_APP__SERVICE_REFS :
- notifier = webRefsGroup;
- break;
- case WebapplicationPackage.WEB_APP__SECURITY_ROLES :
- case WebapplicationPackage.WEB_APP__CONSTRAINTS :
- notifier = webSecurityGroup;
- break;
- case WebapplicationPackage.WEB_APP__LISTENERS :
- notifier = webListenerGroup;
- break;
- }
- if (notifier != null) {
- NotificationWrapper notificationWrapper = new NotificationWrapper(notifier, notification);
- fireNotifyChanged(notificationWrapper);
- }
- }
- super.notifyChanged(notification);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.IDisposable#dispose()
- */
- public void dispose() {
- if (clientMgr != null)
- clientMgr.dispose();
- super.dispose();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java
deleted file mode 100644
index 1b67ce5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,49 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.internal.web.providers.WebapplicationItemProviderAdapterFactory;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEWebItemProviderAdapterFactory extends WebapplicationItemProviderAdapterFactory {
-
- /**
- * Default constructor
- */
- public J2EEWebItemProviderAdapterFactory() {
- super();
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webapplication.util.WebapplicationAdapterFactory#createWebAppAdapter()
- */
- public Adapter createWebAppAdapter() {
- if (webAppItemProvider == null)
- webAppItemProvider = new J2EEWebAppItemProvider(this);
- return webAppItemProvider;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java
deleted file mode 100644
index 7a5695f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java
+++ /dev/null
@@ -1,80 +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
- *******************************************************************************/
-/*
- * Created on Jun 11, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class WebFilterMappingGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebFilterMappingGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory,weakWebApp);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- Object webApp = weakWebApp.get();
- if(null != webApp){
- return ((WebApp)webApp).getFilterMappings();
- }
- return Collections.EMPTY_LIST;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter_mapping"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("FILTER_MAPPING"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java
deleted file mode 100644
index d3809b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java
+++ /dev/null
@@ -1,84 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebFiltersGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebFiltersGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /**
- * This returns Filter.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object webApp = weakWebApp.get();
- if(webApp != null){
- result.addAll(((WebApp)webApp).getFilters());
- }
- return getSortedChildren(result);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.IItemLabelProvider#getText(java.lang.Object)
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Filters_1"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java
deleted file mode 100644
index 4d3e247..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.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
- *******************************************************************************/
-/*
- * Created on Aug 11, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public abstract class WebGroupItemProvider extends J2EEItemProvider {
-
- class WebGroupComparator implements Comparator {
- public int compare(Object o1, Object o2) {
- if (o1 instanceof Servlet) {
- Servlet s1 = (Servlet)o1;
- Servlet s2 = (Servlet)o2;
- if (s1.getServletName() != null && s2.getServletName() != null)
- return s1.getServletName().compareTo(s2.getServletName());
- return -1;
- }
- else if (o1 instanceof Filter) {
- Filter f1 = (Filter) o1;
- Filter f2 = (Filter) o2;
- if (f1.getName() != null && f2.getName() != null)
- return f1.getName().compareTo(f2.getName());
- return -1;
- }
- else if (o1 instanceof Listener) {
- Listener l1 = (Listener) o1;
- Listener l2 = (Listener) o2;
- if (l1.getListenerClassName() != null && l2.getListenerClassName() !=null)
- return l1.getListenerClassName().compareTo(l2.getListenerClassName());
- return -1;
- }
- else return -1;
- }
- }
-
- protected WeakReference weakWebApp;
-
- public WebGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory);
- this.weakWebApp = weakWebApp;
- }
-
- public Collection getSortedChildren(List theChildren) {
- Collections.sort(theChildren, new WebGroupComparator());
- return theChildren;
- }
-
- public void dispose() {
- // TODO Auto-generated method stub
- super.dispose();
- weakWebApp = null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java
deleted file mode 100644
index d58e81f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java
+++ /dev/null
@@ -1,84 +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
- *******************************************************************************/
-/*
- * Created on Jun 11, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class WebListenerGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebListenerGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /**
- * This returns Filter.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getDefault().getImage("listener"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object webApp = weakWebApp.get();
- if(webApp != null){
- result.addAll(((WebApp)webApp).getListeners());
- }
- return getSortedChildren(result);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.IItemLabelProvider#getText(java.lang.Object)
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("LISTENER"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
deleted file mode 100644
index a5fcbbc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
+++ /dev/null
@@ -1,119 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebReferencesGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebReferencesGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object obj = weakWebApp.get();
- if (null != obj) {
- WebApp webApp = (WebApp) obj;
- if (!webApp.getEjbLocalRefs().isEmpty())
- result.addAll(webApp.getEjbLocalRefs());
- if (!webApp.getEjbRefs().isEmpty())
- result.addAll(webApp.getEjbRefs());
- if (!webApp.getResourceEnvRefs().isEmpty())
- result.addAll(webApp.getResourceEnvRefs());
- if (!webApp.getResourceRefs().isEmpty())
- result.addAll(webApp.getResourceRefs());
- if (!webApp.getMessageDestinationRefs().isEmpty())
- result.addAll(webApp.getMessageDestinationRefs());
- if (!webApp.getServiceRefs().isEmpty())
- result.addAll(webApp.getServiceRefs());
- Collection serviceRefs = null;
- try {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- serviceRefs = serviceHelper.get13ServiceRefs(webApp);
- } catch (Exception re) {
- serviceRefs = Collections.EMPTY_LIST;
- }
-
- if (serviceRefs != null && !serviceRefs.isEmpty())
- result.addAll(serviceRefs);
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getDefault().getImage("resourceRef_obj"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("References_1"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java
deleted file mode 100644
index 9da0aad..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java
+++ /dev/null
@@ -1,98 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebSecurityGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebSecurityGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Security_1"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object obj = weakWebApp.get();
- if (null != obj) {
- WebApp webApp = (WebApp) obj;
- if (!webApp.getSecurityRoles().isEmpty())
- result.addAll(webApp.getSecurityRoles());
- if (!webApp.getConstraints().isEmpty())
- result.addAll(webApp.getConstraints());
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("security_role");//$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java
deleted file mode 100644
index b313032..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java
+++ /dev/null
@@ -1,81 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServletGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebServletGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- if (weakWebApp!=null) {
- Object webApp = weakWebApp.get();
- if(null != webApp){
- result.addAll(((WebApp)webApp).getServlets());
- }
- }
- return getSortedChildren(result);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Servlets_1"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java
deleted file mode 100644
index 536b0ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java
+++ /dev/null
@@ -1,92 +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
- *******************************************************************************/
-/*
- * Created on Jun 11, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class WebServletMappingGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebServletMappingGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- Object webApp = weakWebApp.get();
- if (null != webApp) {
- return ((WebApp) webApp).getServletMappings();
- }
- return Collections.EMPTY_LIST;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet_mapping"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Servlet_Mappings_2"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java
deleted file mode 100644
index a59acbe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java
+++ /dev/null
@@ -1,196 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.preferences.AnnotationPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.provider.IAnnotationProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.utility.AnnotationUtilities;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationsStandaloneGroup {
-
- protected Object model;
- protected Object synchHelper;
- protected Button useAnnotations;
- private boolean isForBean;
- private boolean useServletString = false;
- public static final String EJBTAGSET = "ejb"; //$NON-NLS-1$
- public static boolean shouldBeanDefaultUseAnnotations = false;
- public static boolean shouldProjectDefaultUseAnnotations = false;
-
-
- private class CheckboxSelectionListener implements SelectionListener {
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.getSource();
- if (isForBean)
- shouldBeanDefaultUseAnnotations = button.getSelection();
- else
- shouldProjectDefaultUseAnnotations = button.getSelection();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //do nothing
- }
- }
-
- private CheckboxSelectionListener checkboxSelectionListener = new CheckboxSelectionListener();
-
- /**
- * Constructor
- */
- public AnnotationsStandaloneGroup(Composite parent, Object model, boolean forBean) {
- this(parent, model, forBean, false);
- }
-
- /**
- * Constructor
- */
- public AnnotationsStandaloneGroup(Composite parent, Object model, boolean forBean, boolean useServlet) {
- super();
- synchHelper = new DataModelSynchHelper((IDataModel)model);
- this.model = model;
- this.isForBean = forBean;
- this.useServletString = useServlet;
-
- buildComposites(parent);
- }
-
- /**
- * @param parent
- */
- protected void buildComposites(Composite parent) {
- // Add separator
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- separator.setLayoutData(gd);
- // Add spacer
- Label spacer = new Label(parent, SWT.NONE);
- GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
- gd1.horizontalSpan = 3;
- spacer.setLayoutData(gd1);
- // Add annotations checkbox and label
- useAnnotations = new Button(parent, SWT.CHECK);
- String labelText;
- if (useServletString)
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS_SERVLET);
- else if (isForBean)
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS);
- else
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.ADD_ANNOTATIONS_SUPPORT);
- useAnnotations.setText(labelText);
- ((DataModelSynchHelper)synchHelper).synchCheckbox(useAnnotations, IAnnotationsDataModel.USE_ANNOTATIONS, null);
- useAnnotations.addSelectionListener(checkboxSelectionListener);
- GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
- gd2.horizontalSpan = 2;
- useAnnotations.setLayoutData(gd2);
- // If for project, set the global annotations supported
- if (!isForBean)
- setEnablement(null);
- }
-
- public void dispose() {
- ((IDataModel)model).removeListener((DataModelSynchHelper)synchHelper);
- synchHelper = null;
- model = null;
- }
-
- public boolean isAnnotationsSupported(IProject project) {
- //TODO clean up to be module based, not project based
- try {
- // if (isForBean) {
- // AnnotationsController controller =
- // AnnotationsControllerManager.INSTANCE.getAnnotationsController(project);
- // return (controller !=null && controller.isTagHandlerInstalled(EJBTAGSET));
- // }
-// J2EEModuleNature nature = null;
-// if (project != null && project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-// nature = (J2EEModuleNature) project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-// else if (project != null && project.hasNature(IEJBNatureConstants.NATURE_ID))
-// nature = (J2EEModuleNature) project.getNature(IEJBNatureConstants.NATURE_ID);
-//
-// if (!isForBean || (nature != null && nature.getJ2EEVersion() > J2EEVersionConstants.VERSION_1_2))
- return true;
-// return false;
- } catch (Throwable t) {
- t.printStackTrace();
- return false;
- }
- }
-
- public void setEnablement(IProject project) {
- //TODO
- //boolean isEnabled = isAnnotationsSupported(project);
- boolean isControllerEnabled = AnnotationsControllerManager.INSTANCE.isAnyAnnotationsSupported();
- final String preferred = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
- IAnnotationProvider annotationProvider = null;
- boolean isProviderEnabled = false;
- if (preferred !=null) {
- try {
- annotationProvider = AnnotationUtilities.findAnnotationProviderByName(preferred);
- } catch (Exception ex) {
- //Default
- }
- if (annotationProvider != null && annotationProvider.isValid()){
- isProviderEnabled = true;
- }
- }
- boolean shouldEnable = isControllerEnabled || isProviderEnabled;
- if (!shouldEnable) {
- ((IDataModel)model).setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, Boolean.FALSE);
- }
- useAnnotations.setEnabled(shouldEnable);
-// if (!isEnabled || (!isForBean && !shouldProjectDefaultUseAnnotations) || (isForBean && !shouldBeanDefaultUseAnnotations)) {
-// useAnnotations.setSelection(false);
-// model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, Boolean.FALSE);
-// } else {
-// useAnnotations.setSelection(true);
-// model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, Boolean.TRUE);
-// }
- }
-
-
-
- public void setUseServlet(boolean aBoolean) {
- useServletString = aBoolean;
- }
-
- public void setUseAnnotations(boolean aBoolean) {
- if (useAnnotations != null) {
- useAnnotations.setSelection(aBoolean);
- ((IDataModel)model).setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, new Boolean(aBoolean));
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizard.java
deleted file mode 100644
index b18fff0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizard.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 22, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-public class AppClientComponentCreationWizard extends J2EEComponentCreationWizard implements IExecutableExtension, INewWizard {
-
- /**
- * <p>
- * The Wizard ID of the EARComponentCreationWizard. Used for internal purposes and activities management.
- * </p>
- */
- public static final String WIZARD_ID = AppClientComponentCreationWizard.class.getName();
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public AppClientComponentCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public AppClientComponentCreationWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default page image.
- * </p>
- *
- * @see J2EEArtifactCreationWizard#doInit()
- */
- protected void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APPCLIENT_COMPONENT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_PROJECT_WIZARD_BANNER));
- preFillSelectedEARProject();
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Adds a {@link JCAProjectCreationPage} as the {@link J2EEComponentCreationWizard#MAIN_PG}.
- * </p>
- */
- protected void doAddPages() {
- AppClientComponentCreationWizardPage page1 = new AppClientComponentCreationWizardPage(getDataModel(), MAIN_PG);
- addPage(page1);
- super.doAddPages();
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new AppClientComponentCreationDataModelProvider();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizardPage.java
deleted file mode 100644
index 6f752d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizardPage.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 22, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentCreationWizardPage extends J2EEComponentCreationWizardPage {
-
- public Text contextRootNameField = null;
- public Label contextRootLabel = null;
-
-// private static final int SIZING_TEXT_FIELD_WIDTH = 250;
- private AnnotationsStandaloneGroup annotationsGroup;
-
- /**
- * @param model
- * @param pageName
- */
- public AppClientComponentCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APPCLIENT_COMPONENT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APPCLIENT_COMPONENT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_PROJECT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.NEW_APPCLIENT_WIZARD_P1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleCreationPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected void addToAdvancedComposite(Composite advanced) {
- super.addToAdvancedComposite(advanced);
- super.createSourceFolderComposite(advanced);
- createAnnotationsGroup(advanced);
- }
-
- private void createAnnotationsGroup(Composite parent) {
- //annotationsGroup = new AnnotationsStandaloneGroup(parent, getJ2EEModuleCreationDataModel(), false);
- }
-
- protected String[] getValidationPropertyNames() {
- return super.getValidationPropertyNames();
- }
-
- public void dispose() {
- super.dispose();
- if (annotationsGroup != null)
- annotationsGroup.dispose();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java
deleted file mode 100644
index 9fe83e2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java
+++ /dev/null
@@ -1,76 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.AppClientComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Application Client module structures from the Eclipse Workbench to a
- * deployable Application Client Archive *.jar file.
- * </p>
- */
-public final class AppClientComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public AppClientComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public AppClientComponentExportWizard(IDataModel model) {
- super(model);
- }
- protected IDataModelProvider getDefaultProvider() {
- return new AppClientComponentExportDataModelProvider();
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link AppClientExportPage}as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- public void doAddPages() {
- addPage(new AppClientExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_EXPORT_WIZARD_BANNER));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java
deleted file mode 100644
index 8199026..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java
+++ /dev/null
@@ -1,77 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentImportPage extends J2EEModuleImportPage {
- /**
- * @param model
- * @param pageName
- */
- public AppClientComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_IMPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
- */
- protected String getFileImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_FILE_LABEL);
- }
-
- protected String getFileNamesStoreID() {
- return "APP_CLIENT"; //$NON-NLS-1$;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- protected String getProjectImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_PROJECT_LABEL);
- }
-
- // protected J2EEComponentCreationDataModel getNewProjectCreationDataModel() {
- // return getAppClientDataModel().getJ2eeArtifactCreationDataModel();
- // }
- //
- // private AppClientModuleImportDataModel getAppClientDataModel() {
- // return (AppClientModuleImportDataModel) model;
- // }
-
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.IMPORT_APPCLIENT_WIZARD_P1);
- return super.createTopLevelComposite(parent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java
deleted file mode 100644
index c766e79..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java
+++ /dev/null
@@ -1,99 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to import J2EE Application Client module structures into the Eclipse Workbench from
- * an existing Application Client *.jar file.
- * </p>
- */
-public final class AppClientComponentImportWizard extends J2EEComponentImportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public AppClientComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public AppClientComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- // /**
- // * {@inheritDoc}
- // *
- // * <p>
- // * Returns an {@link AppClientImportOperation}using the model either supplied in the
- // * constructor or created from {@link #createDefaultModel()}.
- // * </p>
- // *
- // * @return Returns the operation to be executed when the Wizard completes.
- // */
- // protected WTPOperation getImportOperation() {
- // return new AppClientModuleImportOperation(getSpecificDataModel());
- // }
-
- /**
- * <p>
- * Adds an {@link AppClientImportPage}as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- public void doAddPages() {
- addPage(new AppClientComponentImportPage(getDataModel(), MAIN_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_IMPORT_WIZARD_BANNER));
- // updateEARToModelFromSelection(getSpecificDataModel());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleImportWizard#getModuleValidatorStrings()
- */
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.internal.validation.UIApplicationClientValidator"}; //$NON-NLS-1$
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new AppClientComponentImportDataModelProvider();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java
deleted file mode 100644
index ac8e380..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java
+++ /dev/null
@@ -1,88 +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
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AppClientExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public AppClientExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_EXPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_EXPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_PROJECT_LABEL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof ApplicationClient;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEProjectCreationPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.EXPORT_APPCLIENT_WIZARD_P1);
- return super.createTopLevelComposite(parent);
- }
-
- protected String getCompnentID() {
- return "JST_APPCLIENT"; //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJ2EEComponentsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJ2EEComponentsContentProvider.java
deleted file mode 100644
index a51b970..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJ2EEComponentsContentProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 18, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AvailableJ2EEComponentsContentProvider implements IStructuredContentProvider, ITableLabelProvider {
- //private int j2eeVersion;
-
- public AvailableJ2EEComponentsContentProvider(int j2eeVersion) {
- super();
-// this.j2eeVersion = j2eeVersion;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- Object[] empty = new Object[0];
- if (!(inputElement instanceof IWorkspaceRoot))
- return empty;
- IProject[] projects = ((IWorkspaceRoot) inputElement).getProjects();
- if (projects == null || projects.length == 0)
- return empty;
- List validCompList = new ArrayList();
- for (int i = 0; i < projects.length; i++) {
- // get flexible project
- IProject project = projects[i];
- if(ModuleCoreNature.isFlexibleProject(project)){
- if (J2EEProjectUtilities.isApplicationClientProject(project) ||
- J2EEProjectUtilities.isEJBProject(project) ||
- J2EEProjectUtilities.isDynamicWebProject(project) ||
- J2EEProjectUtilities.isJCAProject(project) ||
- J2EEProjectUtilities.isUtilityProject(project) )
- validCompList.add(project);
- } else
- try {
- if (project.exists() && project.isAccessible() && project.hasNature("org.eclipse.jdt.core.javanature")){ //$NON-NLS-1$
- validCompList.add(project);
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return validCompList.toArray();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- return ((IVirtualComponent) element).getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java
deleted file mode 100644
index 23bf01e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java
+++ /dev/null
@@ -1,237 +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.jst.j2ee.internal.wizard;
-
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.OverlayIcon;
-
-
-public class AvailableJarsProvider implements org.eclipse.jface.viewers.IStructuredContentProvider, org.eclipse.jface.viewers.ITableLabelProvider {
- protected static Image utilImage;
- protected static Image invalidImage;
- protected static Image ejbImage;
- protected static Image ejbClientImage;
-
- /**
- * AvailableJarsContentProvider constructor comment.
- */
- public AvailableJarsProvider() {
- super();
- }
-
- /**
- * Adds a listener to this label provider. Has no effect if an identical listener is already
- * registered.
- * <p>
- * Label provider listeners are informed about state changes that affect the rendering of the
- * viewer that uses this label provider.
- * </p>
- *
- * @param listener
- * a label provider listener
- */
- public void addListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
- //do nothing
- }
-
- /**
- * Disposes of this label provider. When a label provider is attached to a viewer, the viewer
- * will automatically call this method when the viewer is being closed. When label providers are
- * used outside of the context of a viewer, it is the client's responsibility to ensure that
- * this method is called when the provider is no longer needed.
- */
- public void dispose() {
- //dispose
- }
-
- /**
- * Returns the label image for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
- if (columnIndex > 0)
- return null;
- ClasspathElement cp = (ClasspathElement) element;
- if (!cp.isValid())
- return getInvalidImage();
-
- switch (cp.getJarType()) {
- case ClasspathElement.EJB_JAR :
- return getEjbImage();
- case ClasspathElement.EJB_CLIENT_JAR :
- return getEjbClientImage();
- default :
- return getUtilImage();
- }
- }
-
- /**
- * Returns the label text for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public String getColumnText(Object element, int columnIndex) {
- String value = null;
- switch (columnIndex) {
- case 0 : {
- value = ((ClasspathElement) element).getText();
- break;
- }
- case 1 :
- value = ((ClasspathElement) element).getProjectName();
- }
- return value == null ? "" : value;//$NON-NLS-1$
- }
-
- protected static Image getEjbImage() {
- if (ejbImage == null)
- ejbImage = getImageDescriptor("EJBJar").createImage();//$NON-NLS-1$
- return ejbImage;
- }
-
- protected static Image getEjbClientImage() {
- if (ejbClientImage == null)
- ejbClientImage = getImageDescriptor("ejbclientjar_obj").createImage();//$NON-NLS-1$
- return ejbClientImage;
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given element.
- * These elements can be presented as rows in a table, items in a list, etc. The result is not
- * modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- ClassPathSelection selection = (ClassPathSelection) inputElement;
- return filter(selection, selection.getFilterLevel()).toArray();
- }
-
- /**
- * @param list
- */
- private List filter(ClassPathSelection selection, int filterLevel) {
- List list = selection.getClasspathElements();
- List result = new ArrayList(list.size());
- for (int i = 0; i < list.size(); i++) {
- ClasspathElement element = (ClasspathElement) list.get(i);
- if (!element.isSelected()) {
- switch (filterLevel) {
- case (ClassPathSelection.FILTER_EJB_CLIENT_JARS) :
- if (element.isEJBClientJar())
- continue;
- break;
- case (ClassPathSelection.FILTER_EJB_SERVER_JARS) :
- if (element.isEJBJar() && selection.getOppositeElement(element) != null)
- continue;
- }
- }
- result.add(element);
- }
- return result;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- protected static ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
-
- URL gifImageURL = (URL) J2EEPlugin.getPlugin().getImage(key);
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- protected static Image getInvalidImage() {
- if (invalidImage == null) {
- ImageDescriptor base = getImageDescriptor("jar_nonexist_obj");//$NON-NLS-1$
- ImageDescriptor overlay = getImageDescriptor("warning_co");//$NON-NLS-1$
- invalidImage = new OverlayIcon(base, new ImageDescriptor[][]{{overlay}}).createImage();
- }
- return invalidImage;
- }
-
- public static Image getUtilImage() {
- if (utilImage == null)
- utilImage = getImageDescriptor("jar_obj").createImage();//$NON-NLS-1$
- return utilImage;
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a different
- * element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to changes on
- * the new input (using model-specific means), and deregistering the viewer from the old input.
- * In response to these change notifications, the content provider propagates the changes to the
- * viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not previously
- * have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have an input
- */
- public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /**
- * Returns whether the label would be affected by a change to the given property of the given
- * element. This can be used to optimize a non-structural viewer update. If the property
- * mentioned in the update does not affect the label, then the viewer need not update the label.
- *
- * @param element
- * the element
- * @param property
- * the property
- * @return <code>true</code> if the label would be affected, and <code>false</code> if it
- * would be unaffected
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /**
- * Removes a listener to this label provider. Has no affect if an identical listener is not
- * registered.
- *
- * @param listener
- * a label provider listener
- */
- public void removeListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
- //do nothing
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java
deleted file mode 100644
index e8749e2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java
+++ /dev/null
@@ -1,151 +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
- *******************************************************************************/
-/*
- * Created on May 9, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AvailableModuleProjectsProvider implements IStructuredContentProvider, ITableLabelProvider {
- private IDataModel model;
-
- public AvailableModuleProjectsProvider(IDataModel dataModel) {
- super();
- model = dataModel;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- List validModuleProjects = null;
- if (inputElement instanceof IWorkspaceRoot) {
- IProject[] projects = ((IWorkspaceRoot) inputElement).getProjects();
- if (projects.length > 0) {
- int j2eeVersion = model.getIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION);
- for (int i = 0; i < projects.length; i++) {
- if (isValid(projects[i], j2eeVersion)) {
- if (validModuleProjects == null)
- validModuleProjects = new ArrayList();
- validModuleProjects.add(projects[i]);
- }
- }
- }
- }
- if (validModuleProjects == null)
- return new Object[0];
- return validModuleProjects.toArray();
- }
-
- private boolean isValid(IProject project, int j2eeVersion) {
- //migrate to artifact edits
-// try {
-// if (project.hasNature(IEARNatureConstants.NATURE_ID))
-// return false;
-// J2EENature j2eeNature = J2EENature.getRegisteredRuntime(project);
-// if (j2eeNature != null) {
-// return j2eeNature.getJ2EEVersion() <= j2eeVersion;
-// } else if (project.hasNature(JavaCore.NATURE_ID))
-// return true;
-// } catch (CoreException e) {
-// //Ignore
-// }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- return ((IProject) element).getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- model = null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- //do nothing
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java
deleted file mode 100644
index 2871401..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java
+++ /dev/null
@@ -1,181 +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
- *******************************************************************************/
-/*
- * Created on Apr 22, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.FileImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AvailableUtilJarsAndWebLibProvider implements IStructuredContentProvider, ITableLabelProvider {
-
- public AvailableUtilJarsAndWebLibProvider() {
- //Default constructor
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof EARFile) {
- Object[] array = EARComponentImportDataModelProvider.getAllUtilities((EARFile) inputElement).toArray();
-
- List filteredProjects = new ArrayList();
- if (array != null && array.length != 0)
- filteredProjects = filterEJBClientJars(array, ((EARFile) inputElement));
- else
- return new Object[0];
-
- array = filteredProjects.toArray();
- Arrays.sort(array, new Comparator() {
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
-
- });
- return array;
- }
- return new Object[0];
- }
-
- /**
- * @param array
- * @return
- */
- private List filterEJBClientJars(Object[] array, EARFile ear) {
- List utilities = new ArrayList(array.length);
- for (int i = 0; i < array.length; i++) {
- utilities.add(array[i]);
- }
- List ejbJars = ear.getEJBJarFiles();
- if (ejbJars != null) {
- List clientNames = new ArrayList(ejbJars.size());
- for (int j = 0; j < ejbJars.size(); j++) {
- EJBJar jar = ((EJBJarFile) ejbJars.get(j)).getDeploymentDescriptor();
- if (jar != null) {
- clientNames.add(jar.getEjbClientJar());
- }
- }
- if (clientNames != null && !clientNames.isEmpty()) {
- List toRemove = new ArrayList();
- for (int k = 0; k < clientNames.size(); k++) {
- String projectName = (String) clientNames.get(k);
- for (int l = 0; l < utilities.size(); l++) {
- File file = (File) utilities.get(l);
- if (file.getName().equals(projectName))
- toRemove.add(utilities.get(l));
- }
- }
- utilities.removeAll(toRemove);
- }
- }
- return utilities;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return AvailableJarsProvider.getUtilImage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- FileImpl file = (FileImpl) element;
- if (file.getURI().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) {
- String parentWarFileName = ((WARFile) file.eContainer()).getName();
- return parentWarFileName + "#" + file.getURI(); //$NON-NLS-1$
- }
- return file.getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- //Auto-generated method stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //Auto-generated method stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- //Auto-generated method stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- //Auto-generated method stub
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java
deleted file mode 100644
index 4629cc7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java
+++ /dev/null
@@ -1,162 +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
- *******************************************************************************/
-/*
- * Created on Apr 22, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AvailableUtilityJarsProvider implements IStructuredContentProvider, ITableLabelProvider {
-
- public AvailableUtilityJarsProvider() {
- //default constructor
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- /*
- * Object[] array = EARImportDataModel.getAllUtilities((EARFile) inputElement).toArray();
- */
- Object[] array = getJarFilesFromDirectory(inputElement);
- Arrays.sort(array, new Comparator() {
-
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
-
- });
- return array;
- }
-
- /**
- * @param inputElement
- * @return
- */
- private Object[] getJarFilesFromDirectory(Object inputElement) {
-
- List collectedJars = new ArrayList();
- IDataModel model = null;
- if (inputElement instanceof IDataModel)
- model = (IDataModel) inputElement;
- if (model != null) {
-
- String fileName = model.getStringProperty(IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY);
- File directory = new File(fileName);
- if (directory.exists() && directory.canRead() && directory.isDirectory()) {
- File[] availableFiles = directory.listFiles();
-
- if (availableFiles == null)
- return new File[0];
-
- for (int i = 0; i < availableFiles.length; i++)
- if (availableFiles[i] != null && availableFiles[i].getName().endsWith(".jar"))collectedJars.add(availableFiles[i]); //$NON-NLS-1$
- }
- }
- return collectedJars.toArray();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return AvailableJarsProvider.getUtilImage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- /*
- * FileImpl file = (FileImpl) element; if
- * (file.getURI().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) { String parentWarFileName =
- * ((WARFile) file.eContainer()).getName(); return parentWarFileName + "#" + file.getURI();
- * //$NON-NLS-1$ } else return file.getName();
- */
- return element.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- //dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- //do nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ClassesImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ClassesImportWizard.java
deleted file mode 100644
index ac07f23..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ClassesImportWizard.java
+++ /dev/null
@@ -1,177 +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.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.util.CoreUtility;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class ClassesImportWizard extends Wizard implements IImportWizard {
-
- public WizardClassesImportMainPage mainPage = null;
-
- public WizardClassesImportPage1 page1 = null;
-
- private IWorkbench workbench;
-
- private IStructuredSelection selection;
-
- private IPath importedClassesPath;
-
- private IJavaProject javaProject = null;
-
- private IProject project = null;
-
- protected ArrayList fileNames = null;
-
- public ClassesImportWizard() {
- super();
- }
-
- public ClassesImportWizard(IProject project) {
- super();
- this.project = project;
-
- }
-
- public ClassesImportWizard(IProject project, String fileName, List otherFileNames) {
- this(project);
- this.fileNames = new ArrayList();
- this.fileNames.add(fileName);
- int i = fileName.lastIndexOf(java.io.File.separatorChar);
- String parentDir = fileName.substring(0, i);
- if (otherFileNames != null)
- for (int j = otherFileNames.size() - 1; j >= 0; j--) {
- if (otherFileNames.get(j) != null) {
- int k = ((String) otherFileNames.get(j)).lastIndexOf(java.io.File.separatorChar);
- if (k == i && parentDir.equals(((String) otherFileNames.get(j)).substring(0, k))) {
- fileNames.add(otherFileNames.remove(j));
- }
- }
- }
-
- }
-
- public void setFolderPath(IPath path) {
- importedClassesPath = path;
- }
-
- /**
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public boolean performFinish() {
- return page1.finish();
- }
-
- public void createImportedClassesFolder(IProject aProject) {
- //Create imported_classes folder selected project
- IContainer container = aProject;
- IFolder folder = container.getFolder(new Path("imported_classes")); //$NON-NLS-1$
- javaProject = getIJavaProject(aProject);
-
- IPath importedFoldersClass = folder.getFullPath();
-
- CPListElement entry = newCPLibraryElement(folder);
- IClasspathEntry newEntry = entry.getClasspathEntry();
-
- IResource res = entry.getResource();
- if ((res instanceof IFolder) && !res.exists()) {
- try {
- CoreUtility.createFolder((IFolder) res, true, true, null);
-
- } catch (CoreException e) {
- //Ignore
- }
- }
-
- try {
- IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newClasspath = new IClasspathEntry[classpathEntries.length + 1];
-
- for (int i = 0; i < classpathEntries.length; i++) {
- newClasspath[i] = classpathEntries[i];
- }
- newClasspath[classpathEntries.length] = newEntry;
-
- javaProject.setRawClasspath(newClasspath, null);
-
- } catch (JavaModelException e) {
- //Ignore
- }
-
- setFolderPath(importedFoldersClass);
- }
-
- private IJavaProject getIJavaProject(IProject projectHandle) {
- IJavaModel javaModel = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- return javaModel.getJavaProject(projectHandle.getName());
- }
-
- private CPListElement newCPLibraryElement(IResource res) {
-
- return new CPListElement(javaProject, IClasspathEntry.CPE_LIBRARY, res.getFullPath(), res);
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
- */
- public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
- setWindowTitle(J2EEUIMessages.getResourceString("Import_Class_Files_UI")); //$NON-NLS-1$
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
-
- workbench = aWorkbench;
- selection = aSelection;
- if (!aSelection.isEmpty() && aSelection.getFirstElement() instanceof IProject)
- project = (IProject) aSelection.getFirstElement();
-
- if (project != null)
- createImportedClassesFolder(project);
- }
-
- public void addPages() {
- try {
- super.addPages();
- mainPage = new WizardClassesImportMainPage("id", fileNames); //$NON-NLS-1$
- mainPage.setWizard(this);
- if (fileNames == null || fileNames.size() == 0)
- addPage(mainPage);
- page1 = new WizardClassesImportPage1(workbench, selection, importedClassesPath, fileNames);
- page1.setWizard(this);
- addPage(page1);
- } catch (Throwable ex) {
- ex.printStackTrace();
- }
-
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DataModelAnnotationsStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DataModelAnnotationsStandaloneGroup.java
deleted file mode 100644
index 7ec0ba6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DataModelAnnotationsStandaloneGroup.java
+++ /dev/null
@@ -1,160 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-public class DataModelAnnotationsStandaloneGroup {
-
- protected IDataModel model;
- protected DataModelSynchHelper synchHelper;
- protected Button useAnnotations;
- private boolean isForBean;
- private boolean useServletString = false;
-
- public static final String EJBTAGSET = "ejb"; //$NON-NLS-1$
- public static boolean shouldBeanDefaultUseAnnotations = false;
- public static boolean shouldProjectDefaultUseAnnotations = false;
-
-
- private class CheckboxSelectionListener implements SelectionListener {
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.getSource();
- if (isForBean)
- shouldBeanDefaultUseAnnotations = button.getSelection();
- else
- shouldProjectDefaultUseAnnotations = button.getSelection();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //do nothing
- }
- }
-
- private CheckboxSelectionListener checkboxSelectionListener = new CheckboxSelectionListener();
-
- /**
- * Constructor
- */
- public DataModelAnnotationsStandaloneGroup(Composite parent, IDataModel model, boolean forBean, DataModelSynchHelper syncHelp) {
- this(parent, model, forBean, false, syncHelp);
- }
-
- /**
- * Constructor
- */
- public DataModelAnnotationsStandaloneGroup(Composite parent, IDataModel model, boolean forBean, boolean useServlet, DataModelSynchHelper syncHelp) {
- super();
- this.model = model;
- this.isForBean = forBean;
- this.useServletString = useServlet;
- synchHelper = syncHelp;
- buildComposites(parent);
- }
-
- /**
- * @param parent
- */
- protected void buildComposites(Composite parent) {
- // Add separator
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- separator.setLayoutData(gd);
- // Add spacer
- Label spacer = new Label(parent, SWT.NONE);
- GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
- gd1.horizontalSpan = 3;
- spacer.setLayoutData(gd1);
- // Add annotations checkbox and label
- useAnnotations = new Button(parent, SWT.CHECK);
- String labelText;
- if (useServletString)
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS_SERVLET);
- else if (isForBean)
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS);
- else
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.ADD_ANNOTATIONS_SUPPORT);
- useAnnotations.setText(labelText);
- synchHelper.synchCheckbox(useAnnotations, IAnnotationsDataModel.USE_ANNOTATIONS, null);
- useAnnotations.addSelectionListener(checkboxSelectionListener);
- GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
- gd2.horizontalSpan = 2;
- useAnnotations.setLayoutData(gd2);
- // If for project, set the global annotations supported
- if (!isForBean)
- setEnablement(null);
- }
-
- public void dispose() {
- model.removeListener(synchHelper);
- synchHelper = null;
- model = null;
- }
-
- public boolean isAnnotationsSupported(IProject project) {
- //TODO clean up to be module based, not project based
- try {
- // if (isForBean) {
- // AnnotationsController controller =
- // AnnotationsControllerManager.INSTANCE.getAnnotationsController(project);
- // return (controller !=null && controller.isTagHandlerInstalled(EJBTAGSET));
- // }
-// J2EEModuleNature nature = null;
-// if (project != null && project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-// nature = (J2EEModuleNature) project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-// else if (project != null && project.hasNature(IEJBNatureConstants.NATURE_ID))
-// nature = (J2EEModuleNature) project.getNature(IEJBNatureConstants.NATURE_ID);
-//
-// if (!isForBean || (nature != null && nature.getJ2EEVersion() > J2EEVersionConstants.VERSION_1_2))
- return true;
-// return false;
- } catch (Throwable t) {
- t.printStackTrace();
- return false;
- }
- }
-
- public void setEnablement(IProject project) {
- //TODO
- //boolean isEnabled = isAnnotationsSupported(project);
- useAnnotations.setEnabled(true);
-// if (!isEnabled || (!isForBean && !shouldProjectDefaultUseAnnotations) || (isForBean && !shouldBeanDefaultUseAnnotations)) {
-// useAnnotations.setSelection(false);
-// model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, Boolean.FALSE);
-// } else {
-// useAnnotations.setSelection(true);
-// model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, Boolean.TRUE);
-// }
- }
-
- public void setUseServlet(boolean aBoolean) {
- useServletString = aBoolean;
- }
-
- public void setUseAnnotations(boolean aBoolean) {
- if (useAnnotations != null) {
- useAnnotations.setSelection(aBoolean);
- model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, new Boolean(aBoolean));
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java
deleted file mode 100644
index b79213f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 23, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public class DefaultJ2EEComponentCreationWizard extends DataModelWizard {
- private static final String SELECTION_PG = "selection"; //$NON-NLS-1$
-
- /**
- * @param model
- */
- public DefaultJ2EEComponentCreationWizard(IDataModel model) {
- super(model);
- initialize();
- }
-
- /**
- *
- */
- public DefaultJ2EEComponentCreationWizard() {
- super();
- initialize();
- }
-
- /**
- *
- */
- private void initialize() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_WIZ_TITLE));
- String iconPath = "icons/full/"; //$NON-NLS-1$
- try {
- URL installURL = IDEWorkbenchPlugin.getDefault().getDescriptor().getInstallURL();
- URL url = new URL(installURL, iconPath + "wizban/new_wiz.gif"); //$NON-NLS-1$
- ImageDescriptor desc = ImageDescriptor.createFromURL(url);
- setDefaultPageImageDescriptor(desc);
- } catch (MalformedURLException e) {
- // Should not happen. Ignore.
- }
- setNeedsProgressMonitor(true);
- setForcePreviousAndNextButtons(true);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- addPage(new NewJ2EEComponentSelectionPage(getDataModel(), SELECTION_PG));
- }
-
- public boolean canFinish() {
- if (!super.canFinish()) {
- return false;
- }
- return getDataModel().getBooleanProperty(IDefaultJ2EEComponentCreationDataModelProperties.ENABLED);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new DefaultJ2EEComponentCreationDataModelProvider();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationSecondPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationSecondPage.java
deleted file mode 100644
index 8c2f68f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationSecondPage.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 18, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-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;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EARComponentCreationSecondPage extends DataModelWizardPage implements IEarComponentCreationDataModelProperties{
- private Button selectAllButton;
- private Button deselectAllButton;
- private Button newModuleButton;
- private CheckboxTableViewer moduleProjectsViewer;
- private boolean ignoreCheckedState = false;
- /**
- * @param model
- * @param pageName
- */
- public EARComponentCreationSecondPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.ui.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[] {IEarComponentCreationDataModelProperties.J2EE_PROJECTS_LIST};
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.ui.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite modulesGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- modulesGroup.setLayout(layout);
- setInfopopID(IJ2EEUIContextIds.NEW_EAR_ADD_MODULES_PAGE);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- modulesGroup.setLayoutData(gridData);
- createModuleProjectOptions(modulesGroup);
- createButtonsGroup(modulesGroup);
- return modulesGroup;
- }
-
- /**
- * @param modulesGroup
- */
- private void createModuleProjectOptions(Composite modulesGroup) {
- moduleProjectsViewer = CheckboxTableViewer.newCheckList(modulesGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.widthHint = 200;
- gData.heightHint = 80;
- moduleProjectsViewer.getControl().setLayoutData(gData);
- int j2eeVersion = getDataModel().getIntProperty(COMPONENT_VERSION);
- AvailableJ2EEComponentsContentProvider provider = new AvailableJ2EEComponentsContentProvider(j2eeVersion);
- moduleProjectsViewer.setContentProvider(provider);
- moduleProjectsViewer.setLabelProvider(new J2EEComponentLabelProvider());
- setCheckedItemsFromModel();
-
- moduleProjectsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- if (!ignoreCheckedState) {
- getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
- }
- }
- });
- TableLayout tableLayout = new TableLayout();
- moduleProjectsViewer.getTable().setLayout(tableLayout);
- moduleProjectsViewer.getTable().setHeaderVisible(false);
- moduleProjectsViewer.getTable().setLinesVisible(false);
- moduleProjectsViewer.setSorter(null);
- }
-
- /**
- *
- */
- private void setCheckedItemsFromModel() {
- List components = (List) getDataModel().getProperty(IEarComponentCreationDataModelProperties.J2EE_PROJECTS_LIST);
- moduleProjectsViewer.setCheckedElements(components.toArray());
- }
-
- private void refreshModules() {
- moduleProjectsViewer.refresh();
- setCheckedItemsFromModel();
- }
-
- protected List getCheckedJ2EEElementsAsList() {
- Object[] elements = moduleProjectsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else{
- list = new ArrayList();
- for( int i=0; i< elements.length; i++){
- if( elements[i] instanceof IProject ) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
- protected List getCheckedJavaProjectsAsList() {
- Object[] elements = moduleProjectsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else{
- list = new ArrayList();
- for( int i=0; i< elements.length; i++){
- if( elements[i] instanceof IProject ) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_SELECT));
- selectAllButton.addListener(SWT.Selection, this);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.widthHint = 120;
- selectAllButton.setLayoutData(gd);
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_DESELECT));
- deselectAllButton.addListener(SWT.Selection, this);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.widthHint = 120;
- deselectAllButton.setLayoutData(gd);
- newModuleButton = new Button(buttonGroup, SWT.PUSH);
- newModuleButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_NEW));
- newModuleButton.addListener(SWT.Selection, this);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.widthHint = 120;
- newModuleButton.setLayoutData(gd);
- }
-
- /**
- * @see org.eclipse.swt.widgets.Listener#handleEvent(Event)
- */
- public void handleEvent(Event evt) {
- if (evt.widget == selectAllButton)
- handleSelectAllButtonPressed();
- else if (evt.widget == deselectAllButton)
- handleDeselectAllButtonPressed();
- else if (evt.widget == newModuleButton)
- handleNewModuleButtonPressed();
- else
- super.handleEvent(evt);
- }
-
- /**
- *
- */
- private void handleNewModuleButtonPressed() {
- IDataModel aModel = createNewModuleModel();
- DefaultJ2EEComponentCreationWizard wizard = new DefaultJ2EEComponentCreationWizard(aModel);
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- dialog.create();
- if (dialog.open() != IDialogConstants.CANCEL_ID) {
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- moduleProjectsViewer.setInput(input);
- setNewModules(aModel);
- refreshModules();
- }
- }
- /**
- * @param model
- */
- private void setNewModules(IDataModel defaultModel) {
- List newComponents = new ArrayList();
- collectNewComponents(defaultModel, newComponents);
- List oldComponents = (List) getDataModel().getProperty(IEarComponentCreationDataModelProperties.J2EE_PROJECTS_LIST);
- newComponents.addAll(oldComponents);
- getDataModel().setProperty(IEarComponentCreationDataModelProperties.J2EE_PROJECTS_LIST, newComponents);
- }
-
- private void collectNewComponents(IDataModel defaultModel, List newProjects) {
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_EJB), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_WEB), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_CLIENT), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_JCA), newProjects);
- }
- private void collectComponents(IDataModel compDM, List newProjects) {
- if (compDM != null) {
- String projectName = compDM.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- if(projectName == null) return;
- IProject project = ProjectUtilities.getProject(projectName);
- /**
- * Warning cleanup 12/07/2005
- */
- //String compName = compDM.getStringProperty(IComponentCreationDataModelProperties.COMPONENT_NAME);
- if (project != null && project.exists())
- newProjects.add(project);
- }
- }
-
- private IDataModel createNewModuleModel() {
- IDataModel defaultModel = DataModelFactory.createDataModel(new DefaultJ2EEComponentCreationDataModelProvider());
- // transfer properties, project name
- String projectName = model.getStringProperty(PROJECT_NAME);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.PROJECT_NAME, projectName);
- // ear component name
- String earName = model.getStringProperty(COMPONENT_NAME);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earName);
- // ear j2ee version
- int j2eeVersion = model.getIntProperty(COMPONENT_VERSION);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.J2EE_VERSION, new Integer(j2eeVersion));
- return defaultModel;
- }
-
- /**
- *
- */
- private void handleDeselectAllButtonPressed() {
- ignoreCheckedState = true;
- try {
- moduleProjectsViewer.setAllChecked(false);
- //getDataModel().setProperty(J2EE_COMPONENT_LIST, null);
- //IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- //(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(J2EE_PROJECTS_LIST, null);
- getDataModel().setProperty(JAVA_PROJECT_LIST, null);
- } finally {
- ignoreCheckedState = false;
- }
- }
-
- /**
- *
- */
- private void handleSelectAllButtonPressed() {
- ignoreCheckedState = true;
- try {
- moduleProjectsViewer.setAllChecked(true);
- //getDataModel().setProperty(J2EE_COMPONENT_LIST, getCheckedElementsAsList());
- //IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- //(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
-
- getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
-
- } finally {
- ignoreCheckedState = false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#enter()
- */
- protected void enter() {
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- moduleProjectsViewer.setInput(input);
- super.enter();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizard.java
deleted file mode 100644
index 0dbeb11..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizard.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-public class EARComponentCreationWizard extends J2EEComponentCreationWizard implements IExecutableExtension, INewWizard {
-
- /**
- * <p>
- * The Wizard ID of the EARComponentCreationWizard. Used for internal purposes and activities management.
- * </p>
- */
- public static final String WIZARD_ID = EARComponentCreationWizard.class.getName();
- protected static final String SECOND_PG = "second"; //$NON-NLS-1$
-
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public EARComponentCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public EARComponentCreationWizard(IDataModel model) {
- super(model);
- }
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default page image.
- * </p>
- *
- * @see J2EEArtifactCreationWizard#doInit()
- */
- protected void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Adds a {@link JCAProjectCreationPage} as the {@link J2EEComponentCreationWizard#MAIN_PG}.
- * </p>
- */
- protected void doAddPages() {
- EARComponentCreationWizardPage page1 = new EARComponentCreationWizardPage(getDataModel(), MAIN_PG);
- page1.setInfopopID(IJ2EEUIContextIds.NEW_EAR_COMP_PAGE); //$NON-NLS-1$
- addPage(page1);
- EARComponentCreationSecondPage page2 = new EARComponentCreationSecondPage(getDataModel(), SECOND_PG);
- addPage(page2);
- super.doAddPages();
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new EarComponentCreationDataModelProvider();
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizardPage.java
deleted file mode 100644
index c8f9bf6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizardPage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EARComponentCreationWizardPage extends J2EEComponentCreationWizardPage {
-
-// private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-
- /**
- * @param model
- * @param pageName
- */
- public EARComponentCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleCreationPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected void addToAdvancedComposite(Composite advanced) {
- super.addToAdvancedComposite(advanced);
- }
-
- //TODO: utility to handle additions
- protected String[] getValidationPropertyNames() {
- return new String[] {IComponentCreationDataModelProperties.PROJECT_NAME, COMPONENT_NAME, COMPONENT_VERSION, IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID };
- }
-
- public void dispose() {
- super.dispose();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java
deleted file mode 100644
index 84c2085..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java
+++ /dev/null
@@ -1,93 +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
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentExportPage extends J2EEExportPage {
- /**
- * @param model
- * @param pageName
- */
- public EARComponentExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_EXPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_EXPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_PROJECT_FOR_MODULE_CREATION);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- protected String[] getFilterExpression() {
- return new String[]{"*.ear"}; //$NON-NLS-1$
- }
-
- /**
- * @return
- */
- protected boolean shouldShowProjectFilesCheckbox() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof Application;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING};
- }
-
- protected String getInfopopID() {
- return IJ2EEUIContextIds.EXPORT_EAR_WIZARD_P1;
- }
-
- protected String getCompnentID() {
- return "JST_EAR"; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java
deleted file mode 100644
index a9b2611..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java
+++ /dev/null
@@ -1,78 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Enterprise Application structures from the Eclipse Workbench to a
- * deployable Enterprise Application Archive *.ear file.
- * </p>
- */
-public final class EARComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public EARComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public EARComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new EARComponentExportDataModelProvider();
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link EARComponentExportPage}as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- public void doAddPages() {
- addPage(new EARComponentExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_EXPORT_WIZARD_BANNER));
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java
deleted file mode 100644
index adea480..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java
+++ /dev/null
@@ -1,321 +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
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentImportOptionsPage extends J2EEImportPage {
- private Button deselectAllButton;
- private Button selectAllButton;
- private Label moduleProjectLocationLabel;
- protected Button browseButton;
- protected Button useAlternateRootBtn;
- protected Text systemDefaultText;
- protected EARFile earFile;
- public CheckboxTableViewer availableJARsViewer;
- public boolean utilJarSelectionChanged = false;
-
- /**
- * @param model
- * @param pageName
- */
- public EARComponentImportOptionsPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P2);
- GridLayout layout = new GridLayout();
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- createJARsComposite(composite);
- createProjectRootComposite(composite);
-
- return composite;
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
- utilJarSelectionChanged = true;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gData.widthHint = 200;
- gData.heightHint = 80;
- availableJARsViewer.getControl().setLayoutData(gData);
- AvailableUtilJarsAndWebLibProvider availableUtilJARsProvider = new AvailableUtilJarsAndWebLibProvider();
- availableJARsViewer.setContentProvider(availableUtilJARsProvider);
- availableJARsViewer.setLabelProvider(availableUtilJARsProvider);
- availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- updateButtonEnablements();
- }
- });
- TableLayout tableLayout = new TableLayout();
- availableJARsViewer.getTable().setLayout(tableLayout);
- availableJARsViewer.getTable().setHeaderVisible(false);
- availableJARsViewer.getTable().setLinesVisible(false);
-
- model.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(IEARComponentImportDataModelProperties.UTILITY_LIST)) {
- availableJARsViewer.setCheckedElements(((List) model.getProperty(IEARComponentImportDataModelProperties.UTILITY_LIST)).toArray());
- }
- }
- });
- }
-
- private void handleDeselectAllButtonPressed() {
- ArrayList emptySelection = new ArrayList(2);
- model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, emptySelection);
- }
-
- private void handleSelectAllButtonPressed() {
- ArrayList allSelection = new ArrayList(2);
- Object selection = null;
- for (int i = 0; (null != (selection = availableJARsViewer.getElementAt(i))); i++) {
- allSelection.add(selection);
- }
- model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, allSelection);
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
- dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
- String dirName = getBrowseStartLocation();
-
- if (!isNullOrEmpty(dirName)) {
- File path = new File(dirName);
- if (path.exists())
- dialog.setFilterPath(dirName);
- }
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- systemDefaultText.setText(selectedDirectory);
-
- }
-
- protected String getBrowseStartLocation() {
- String text = systemDefaultText.getText();
- return text;
- }
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON)); //$NON-NLS-1$ = "Select All"
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = 22;
- gd.widthHint = 120;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleSelectAllButtonPressed();
- }
- });
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON)); //$NON-NLS-1$ = "Deselect All"
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- gd.heightHint = 22;
- gd.widthHint = 120;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleDeselectAllButtonPressed();
- }
- });
- }
-
- protected void createJARsComposite(Composite parent) {
- Group group = new Group(parent, SWT.NULL);
- group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_JARS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- group.setLayout(layout);
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label description = new Label(group, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 3;
- description.setLayoutData(gd2);
-
- // create jars check box viewer
- createAvailableJarsList(group);
- createButtonsGroup(group);
- }
-
- protected void createProjectRootComposite(Composite parent) {
- Group group = new Group(parent, SWT.NULL);
- group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOCATIONS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- group.setLayout(layout);
- group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label description = new Label(group, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_PROJECT_GROUP_DESCRIPTION));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 3;
- description.setLayoutData(gd2);
-
- moduleProjectLocationLabel = new Label(group, SWT.NULL);
- moduleProjectLocationLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.USE_DEFAULT_ROOT_RADIO));
- moduleProjectLocationLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- systemDefaultText = new Text(group, SWT.READ_ONLY | SWT.WRAP | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- systemDefaultText.setLayoutData(gd);
- synchHelper.synchText(systemDefaultText, IEARComponentImportDataModelProperties.NESTED_MODULE_ROOT, null);
-
- browseButton = new Button(group, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
- browseButton.setLayoutData(gd);
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleBrowseButtonPressed();
- }
- });
- }
-
- private void refreshEARFileIfNecessary() {
- if (isEARFileChanged()) {
- earFile = (EARFile) model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- refresh();
- }
- }
-
- protected void setJARsCompositeEnabled(boolean enabled) {
- availableJARsViewer.getTable().setEnabled(enabled);
- availableJARsViewer.setAllChecked(false);
- availableJARsViewer.setAllGrayed(!enabled);
- selectAllButton.setEnabled(enabled);
- deselectAllButton.setEnabled(enabled);
- }
-
- private void refresh() {
- availableJARsViewer.setInput(earFile);
- }
-
- public boolean isEARFileChanged() {
- return earFile != model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- }
-
- protected void enter() {
- super.enter();
- refreshEARFileIfNecessary();
- }
-
- public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, getJARsForProjects());
- validatePage();
- }
-
- public List getJARsForProjects() {
- refreshEARFileIfNecessary();
- List result = new ArrayList();
- result.addAll(Arrays.asList(availableJARsViewer.getCheckedElements()));
- return result;
- }
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{};
- }
-
- protected void restoreWidgetValues() {
- // This page doesn't implement...
- }
-
- public void storeDefaultSettings() {
- // This page doesn't implement...
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java
deleted file mode 100644
index b2a5e77..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java
+++ /dev/null
@@ -1,131 +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
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentImportPage extends J2EEImportPage {
- protected Combo serverTargetCombo;
-
- /**
- * @param model
- * @param pageName
- */
- public EARComponentImportPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P1);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createFileNameComposite(composite);
- createProjectNameComposite(composite);
- createAnnotationsStandaloneGroup(composite);
- restoreWidgetValues();
- return composite;
- }
-
- protected IDataModel getNewProjectCreationDataModel() {
- IDataModel earModel = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
- earModel.setIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION, model.getIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION));
- earModel.setProperty(IComponentCreationDataModelProperties.PROJECT_NAME, model.getProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- earModel.setProperty(IComponentCreationDataModelProperties.COMPONENT_NAME, model.getProperty(IComponentCreationDataModelProperties.COMPONENT_NAME));
- return earModel;
- }
-
- protected String getProjectImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_LABEL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
- */
- protected String getFileImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_FILE_LABEL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- protected String[] getFilterExpression() {
- return new String[]{"*.ear"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleImportPage#createAnnotationsStandaloneGroup(org.eclipse.swt.widgets.Composite)
- */
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- // new AnnotationsStandaloneGroup(composite, model, false);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentImportDataModelProperties.FILE_NAME, IJ2EEComponentImportDataModelProperties.PROJECT_NAME, IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID, IAnnotationsDataModel.USE_ANNOTATIONS};
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileNamesStoreID()
- */
- protected String getFileNamesStoreID() {
- return "EAR";//$NON-NLS-1$
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java
deleted file mode 100644
index e67fede..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java
+++ /dev/null
@@ -1,104 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to import J2EE Application structures into the Eclipse Workbench from an existing
- * Enterprise Application Archive *.ear file.
- * </p>
- */
-public final class EARComponentImportWizard extends J2EEArtifactImportWizard implements IExecutableExtension, IImportWizard {
-
- /**
- * <p>
- * Constant used to identify the key of the Projects page of the Wizard.
- * </p>
- */
- protected static final String PROJECT_PG = "projects"; //$NON-NLS-1$
-
- /**
- * <p>
- * Constant used to identify the key of the Options page of the Wizard.
- * </p>
- */
- protected static final String OPTIONS_PG = "options"; //$NON-NLS-1$
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public EARComponentImportWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public EARComponentImportWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link EARComponentImportPage}as the main wizard page ({@link #MAIN_PG})
- * <li>{@link EARComponentImportOptionsPage}as the options wizard page ({@link #OPTIONS_PG})
- * <li>{@link EARComponentProjectsPage}as the project wizard page ({@link #PROJECT_PG})
- * </ul>
- *
- * </p>
- */
- public void doAddPages() {
- addPage(new EARComponentImportPage(getDataModel(), MAIN_PG));
- addPage(new EARComponentImportOptionsPage(getDataModel(), OPTIONS_PG));
- addPage(new EARComponentProjectsPage(getDataModel(), PROJECT_PG));
- }
-
-
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- protected void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new EARComponentImportDataModelProvider();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java
deleted file mode 100644
index 7089fe4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java
+++ /dev/null
@@ -1,293 +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
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentProjectsPage extends J2EEImportPage {
-
- private CheckboxTableViewer earFileListViewer;
-
- public static final String INCLUDE_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_0"); //$NON-NLS-1$
- public static final String FILE_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_1"); //$NON-NLS-1$
- public static final String PROJECT_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_2"); //$NON-NLS-1$
-
- /**
- * @param model
- * @param pageName
- */
- public EARComponentProjectsPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P3);
- GridLayout layout = new GridLayout();
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- createListGroup(composite);
- createButtonsGroup(composite);
-
- return composite;
- }
-
- protected void setColumnEditors() {
- Table t = earFileListViewer.getTable();
- CellEditor[] columnEditors = new CellEditor[t.getColumnCount()];
- columnEditors[1] = new TextCellEditor(t);
-
- earFileListViewer.setCellEditors(columnEditors);
- }
-
- protected void createButtonsGroup(Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Button selectNotInWorkspace = new Button(buttonGroup, SWT.PUSH);
- selectNotInWorkspace.setText(J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_3")); //$NON-NLS-1$
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = 22;
- gd.widthHint = 120;
- selectNotInWorkspace.setLayoutData(gd);
- selectNotInWorkspace.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- List list = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- List selectedList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
- List newList = new ArrayList();
- newList.addAll(selectedList);
- IDataModel importDM = null;
- for (int i = 0; i < list.size(); i++) {
- importDM = (IDataModel) list.get(i);
- if (!newList.contains(importDM) && !((IVirtualComponent) importDM.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT)).exists()) {
- newList.add(importDM);
- }
- }
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
- }
- });
-
- Button selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON));
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = 22;
- gd.widthHint = 120;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- List list = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- List newList = new ArrayList();
- newList.addAll(list);
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
- }
- });
-
- Button deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON));
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = 22;
- gd.widthHint = 120;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- List newList = new ArrayList();
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
- }
- });
- }
-
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST)) {
- if(earFileListViewer != null){
- updateGUICheckSelection();
- }
- }
- super.propertyChanged(event);
- }
-
- public void setFileListViewerInput() {
- TableObjects files = new TableObjects();
- Iterator iterator = ((List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST)).iterator();
- while (iterator.hasNext()) {
- files.tableObjectsList.add(iterator.next());
- }
- earFileListViewer.setInput(files);
- updateGUICheckSelection();
- }
-
- private void updateGUICheckSelection() {
- List selectedList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
- List projectList = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- Object currentElement = null;
- for (int i = 0; i < projectList.size(); i++) {
- currentElement = projectList.get(i);
- earFileListViewer.setChecked(currentElement, selectedList.contains(currentElement));
- }
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.internal.wizard.J2EEWizardPage#enter()
- */
- protected void enter() {
- super.enter();
- setFileListViewerInput();
- validatePage();
- }
-
- /**
- * Creates the import source specification widgets. <b>Subclasses </b> must override this hook
- * method.
- *
- * @param parent
- * a <code>Composite</code> that is to be used as the parent of this group's
- * collection of visual components
- * @see org.eclipse.swt.widgets.Composite
- */
- protected void createListGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- listGroup.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- listGroup.setLayoutData(gd);
-
- earFileListViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
- EARImportListContentProvider provider = new EARImportListContentProvider();
- earFileListViewer.setContentProvider(provider);
- earFileListViewer.setLabelProvider(provider);
- earFileListViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- IDataModel matchingModel = null;// getEARImportDataModel().getMatchingEJBJarOrClient(aModel);
- if (null != matchingModel) {
- earFileListViewer.setChecked(matchingModel, event.getChecked());
- }
- List result = new ArrayList();
- result.addAll(Arrays.asList(earFileListViewer.getCheckedElements()));
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, result);
-
- }
- });
-
- Table earFileListTable = (Table) earFileListViewer.getControl();
- earFileListTable.setHeaderVisible(true);
- earFileListTable.setLinesVisible(true);
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(100, true));
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- earFileListTable.setLayout(tableLayout);
-
- gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- earFileListTable.setLayoutData(gd);
-
-
- TableColumn fileNameColumns = new TableColumn(earFileListTable, SWT.NONE);
- fileNameColumns.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_Modules_in_EAR)); //$NON-NLS-1$ = "Modules in EAR"
- fileNameColumns.setResizable(true);
-
- TableColumn importNameColumn = new TableColumn(earFileListTable, SWT.NONE);
- importNameColumn.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_New_Project_Name)); //$NON-NLS-1$ = "New Project Name"
- importNameColumn.setResizable(true);
-
- String[] columnProperties = new String[2];
- columnProperties[0] = FILE_COLUMN;
- columnProperties[1] = PROJECT_COLUMN;
- earFileListViewer.setColumnProperties(columnProperties);
-
- setColumnEditors();
- earFileListViewer.setCellModifier(new ICellModifier() {
- public boolean canModify(Object element, String property) {
- return PROJECT_COLUMN.equals(property);
- }
-
- public Object getValue(Object element, String property) {
- TableItem[] items = earFileListViewer.getTable().getSelection();
- TableItem item = items[0];
- return item.getText(1);
- }
-
- public void modify(Object element, String property, Object value) {
- TableItem elementHolder = (TableItem) element;
- if (property.equals(PROJECT_COLUMN)) {
- elementHolder.setText(1, (String) value);
- ((IDataModel) elementHolder.getData()).setProperty(IJ2EEComponentImportDataModelProperties.COMPONENT_NAME, value);
- }
- }
- });
- }
-
-
- protected void restoreWidgetValues() {
- // This page doesn't implement...
- }
-
- public void storeDefaultSettings() {
- // This page doesn't implement...
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST};
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java
deleted file mode 100644
index fac4333..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java
+++ /dev/null
@@ -1,100 +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.jst.j2ee.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-/**
- * Insert the type's description here. Creation date: (5/7/2001 11:39:11 AM)
- *
- * @author: Administrator
- */
-public class EARImportListContentProvider extends LabelProvider implements IStructuredContentProvider, ITableLabelProvider {
- /**
- * EARImportListContentProvider constructor comment.
- */
- public EARImportListContentProvider() {
- super();
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given element.
- * These elements can be presented as rows in a table, items in a list, etc. The result is not
- * modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- if (inputElement instanceof TableObjects) {
- Object[] array = ((TableObjects) inputElement).getTableObjects().toArray();
- Arrays.sort(array, new Comparator() {
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
- });
- return array;
- }
- return new Object[0]; // should throw exception instead
- }
-
- /**
- * Returns the label image for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- /**
- * Returns the label text for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public String getColumnText(Object element, int columnIndex) {
- IDataModel dataModel = (IDataModel) element;
- if (columnIndex == 0) {
- return ((Archive) dataModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE)).getURI();
- } else if (columnIndex == 1) {
- return dataModel.getStringProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME);
- }
- return ""; //$NON-NLS-1$
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // do nothing
- }
-
- public void dispose() {
- // dispose
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java
deleted file mode 100644
index 7b3772c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java
+++ /dev/null
@@ -1,92 +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.jst.j2ee.internal.wizard;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.validation.UIEarValidator;
-import org.eclipse.wst.common.frameworks.internal.ui.RunnableWithProgressWrapper;
-import org.eclipse.wst.validation.internal.operations.OneValidatorOperation;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-
-public class EARValidationHelper {
-
- /**
- * Constructor for EARValidationHelper.
- */
- private EARValidationHelper() {
- super();
- }
-
- /**
- * Return a list of runnable validation operations for all EAR projects which have auto validate
- * enabled, and are impacted by the list of projects; If the ear project itself is in the list,
- * then it is skipped.
- */
- public static IRunnableWithProgress[] getEARValidationOperations(List modifiedProjects) {
- List earProjects = Arrays.asList(J2EEProjectUtilities.getAllProjectsInWorkspaceOfType(J2EEProjectUtilities.ENTERPRISE_APPLICATION));
- List result = new ArrayList(earProjects.size());
- for (int i = 0; i < earProjects.size(); i++) {
- IProject earProj = (IProject) earProjects.get(i);
- if (willEARProjectNeedValidation(earProj, modifiedProjects)) {
- result.add(createValidationRunnable(earProj));
- }
- }
- return (IRunnableWithProgress[]) result.toArray(new IRunnableWithProgress[result.size()]);
- }
-
- /**
- * Return a list of runnable validation operations for all EAR projects which have auto validate
- * enabled, and are impacted by the j2ee project
- */
- public static IRunnableWithProgress[] getEARValidationOperations(IProject modifiedJ2EEProject) {
- return getEARValidationOperations(Collections.singletonList(modifiedJ2EEProject));
- }
-
- public static boolean isEARValidationAutoEnabled(IProject earProj) {
- return ValidatorManager.getManager().isAutoValidate(earProj) && ValidatorManager.getManager().isEnabled(earProj, UIEarValidator.VALIDATOR_ID);
- }
-
- private static boolean willEARProjectNeedValidation(IProject earProj, List modifiedProjects) {
- if (modifiedProjects.contains(earProj) || !isEARValidationAutoEnabled(earProj))
- return false;
- //TODO migrate to use artifact edits and components
-// Object accessorKey = new Object();
-// EAREditModel editModel = runtime.getEarEditModelForRead(accessorKey);
-// try {
-// for (int i = 0; i < modifiedProjects.size(); i++) {
-// if (editModel.hasMappingToProject((IProject) modifiedProjects.get(i)))
-// return true;
-// }
-// } finally {
-// if (editModel != null)
-// editModel.releaseAccess(accessorKey);
-// }
- return false;
- }
-
- /**
- * Creates a new IRunnableWithProgress which runs a one validator operation on the EAR project
- */
- public static IRunnableWithProgress createValidationRunnable(IProject earProj) {
- OneValidatorOperation op = new OneValidatorOperation(earProj, UIEarValidator.VALIDATOR_ID, true, false);
-
- return new RunnableWithProgressWrapper(op);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizard.java
deleted file mode 100644
index 924193d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizard.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 14, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFlexibleProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public class FlexibleProjectCreationWizard extends DataModelWizard implements INewWizard, IExecutableExtension, IFlexibleProjectCreationDataModelProperties {
-
- /**
- * <p>
- * Constant used to identify the key of the main page of the Wizard.
- * </p>
- */
- protected static final String MAIN_PG = "main"; //$NON-NLS-1$
- private IStructuredSelection selection;
- private IConfigurationElement configurationElement;
- public static final String WIZARD_ID = FlexibleProjectCreationWizard.class.getName();
-
- /**
- * <p>
- * Creates a default instance of the wizard with no configuration data, no selection, and no
- * operation data model.
- * </p>
- */
- public FlexibleProjectCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate wizard controls and to collect data from the user. The model
- * will eventually be used to run the operation, if the user does not cancel the Wizard.
- * </p>
- *
- * @param model
- * used to collect information and interface with the WTP Operation
- */
- public FlexibleProjectCreationWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.FLEXIBLE_PROJECT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- setHelpAvailable(false);
- }
-
- /**
- * <p>
- * The selection is used to pre-populate values in the Wizard dialog controls.
- * </p>
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- *
- * @param workbench
- * the current workbench parent of the wizard
- * @param aSelection
- * the selection from the view used to start the wizard (if any)
- */
- public final void init(IWorkbench workbench, IStructuredSelection aSelection) {
- setNeedsProgressMonitor(true);
- this.selection = aSelection;
- }
-
- /**
- * {@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>
- * Returns the value specified by {@link #getWizardId()}
- * </p>
- *
- * @return Returns the an id component used for Activity filtering.
- */
- public final String getLocalId() {
- return getWizardID();
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- protected void doAddPages() {
- addPage(new FlexibleProjectCreationWizardPage(getDataModel(), MAIN_PG));
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new FlexibleJavaProjectCreationDataModelProvider();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizardPage.java
deleted file mode 100644
index 2ae501e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizardPage.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 14, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Point;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationProperties;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-
-public class FlexibleProjectCreationWizardPage extends DataModelWizardPage implements IFlexibleJavaProjectCreationDataModelProperties {
- private static final boolean isWindows = SWT.getPlatform().toLowerCase().startsWith("win"); //$NON-NLS-1$
-
- protected NewFlexibleProjectGroup projectNameGroup;
- protected Composite advancedComposite;
- protected Button advancedButton;
- protected boolean showAdvanced = false;
- protected AdvancedSizeController advancedController;
- protected boolean advancedControlsBuilt = false;
- protected Combo serverTargetCombo;
-
- private class AdvancedSizeController implements ControlListener {
- private int advancedHeight = -1;
- private Point originalSize;
- private boolean ignoreShellResize = false;
-
- private AdvancedSizeController(Shell aShell) {
- originalSize = aShell.getSize();
- aShell.addControlListener(this);
- }
-
- public void controlMoved(ControlEvent e) {
- //do nothing
- }
-
- public void controlResized(ControlEvent e) {
- if (!ignoreShellResize) {
- Control control = (Control) e.getSource();
- if (control.isVisible()) {
- originalSize = control.getSize();
- if (advancedHeight == -1)
- setShellSizeForAdvanced();
- }
- }
- }
-
- protected void resetOriginalShellSize() {
- setShellSize(originalSize.x, originalSize.y);
- }
-
- private void setShellSize(int x, int y) {
- ignoreShellResize = true;
- try {
- getShell().setSize(x, y);
- } finally {
- ignoreShellResize = false;
- }
- }
-
- protected void setShellSizeForAdvanced() {
- int height = calculateAdvancedShellHeight();
- if (height != -1)
- setShellSize(getShell().getSize().x, height);
- }
-
- private int calculateAdvancedShellHeight() {
- Point advancedCompSize = advancedComposite.getSize();
- if (advancedCompSize.x == 0)
- return -1;
- int height = computeAdvancedHeight();
- if (!showAdvanced && height != -1)
- height = height - advancedComposite.getSize().y;
- return height;
- }
-
- /*
- * Compute the height with the advanced section showing. @return
- */
- private int computeAdvancedHeight() {
- if (advancedHeight == -1) {
- Point controlSize = getControl().getSize();
- if (controlSize.x != 0) {
- int minHeight = originalSize.y - controlSize.y;
- Point pageSize = getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- advancedHeight = pageSize.y + minHeight;
- }
- }
- return advancedHeight;
- }
- }
-
- /**
- * @param model
- * @param pageName
- */
- public FlexibleProjectCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.FLEXIBLE_PROJECT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.FLEXIBLE_PROJECT_MAIN_PG_DESC));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEProjectCreationPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.NEW_EAR_WIZARD_P1);
- Composite top = new Composite(parent, SWT.NONE);
- top.setLayout(new GridLayout());
- top.setData(new GridData(GridData.FILL_BOTH));
- Composite composite = new Composite(top, SWT.NONE);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createProjectNameGroup(composite);
- Composite detail = new Composite(top, SWT.NONE);
- detail.setLayout(new GridLayout());
- detail.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- createAdvancedComposite(detail);
- return top;
- }
-
- protected void createProjectNameGroup(Composite parent) {
- projectNameGroup = new NewFlexibleProjectGroup(parent, SWT.NULL, model, synchHelper);
- }
-
- /**
- * @param parent
- */
- protected Composite createAdvancedComposite(Composite parent) {
- advancedControlsBuilt = true;
- advancedButton = new Button(parent, SWT.TOGGLE);
- setAdvancedLabelText();
- final Cursor hand = new Cursor(advancedButton.getDisplay(), SWT.CURSOR_HAND);
- advancedButton.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- hand.dispose();
- }
- });
- advancedButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- toggleAdvanced(true);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //do nothing
- }
- });
- advancedButton.addListener(SWT.MouseHover, new Listener() {
- public void handleEvent(Event event) {
- if (event.type == SWT.MouseHover)
- advancedButton.setCursor(hand);
- }
- });
- advancedComposite = new Composite(parent, SWT.NONE);
- //toggleAdvanced(false);
- GridLayout layout = new GridLayout(3, false);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- advancedComposite.setLayoutData(data);
- advancedComposite.setLayout(layout);
- addToAdvancedComposite(advancedComposite);
- return advancedComposite;
- }
-
- /**
- * @param advancedLabel
- */
- private void setAdvancedLabelText() {
- if (advancedControlsBuilt) {
- if (showAdvanced)
- advancedButton.setText(J2EEUIMessages.getResourceString("J2EEProjectCreationPage_UI_0")); //$NON-NLS-1$
- else
- advancedButton.setText(J2EEUIMessages.getResourceString("J2EEProjectCreationPage_UI_1")); //$NON-NLS-1$
- }
- }
-
- /**
- * @param advancedLabel
- */
- protected void toggleAdvanced(boolean setSize) {
- if (advancedControlsBuilt) {
- showAdvanced = !showAdvanced;
- advancedComposite.setVisible(showAdvanced);
- setAdvancedLabelText();
- if (setSize && isWindows)
- advancedController.setShellSizeForAdvanced();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
- */
- protected void enter() {
- if (advancedControlsBuilt) {
- if (isFirstTimeToPage)
- initializeAdvancedController();
- if (isWindows) {
- advancedController.setShellSizeForAdvanced();
- }
- }
- super.enter();
- }
-
- private void initializeAdvancedController() {
- advancedController = new AdvancedSizeController(getShell());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#exit()
- */
- protected void exit() {
- if (advancedControlsBuilt && isWindows) {
- advancedController.resetOriginalShellSize();
- }
- super.exit();
- }
-
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- serverTargetCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Button newServerTargetButton = new Button(parent, SWT.NONE);
- newServerTargetButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E));
- newServerTargetButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- FlexibleProjectCreationWizardPage.launchNewRuntimeWizard(getShell(), model.getNestedModel(NESTED_MODEL_SERVER_TARGET));
- }
- });
- Control[] deps = new Control[]{label, newServerTargetButton};
- synchHelper.synchCombo(serverTargetCombo, RUNTIME_TARGET_ID, deps);
- if(serverTargetCombo.getVisibleItemCount() != 0)
- serverTargetCombo.select(0);
- }
-
- protected void addToAdvancedComposite(Composite parent) {
- createServerTargetComposite(parent);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{IProjectCreationProperties.PROJECT_NAME, PROJECT_LOCATION, RUNTIME_TARGET_ID};
- }
-
- public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
- DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
- boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (isOK && model != null) {
- model.notifyPropertyChange(RUNTIME_TARGET_ID, IDataModel.VALID_VALUES_CHG);
- DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
- 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 = ProjectUtilities.getNewObject(preAddition, postAddition);
-
- model.notifyPropertyChange(RUNTIME_TARGET_ID, IDataModel.VALID_VALUES_CHG);
- if (newAddition != null)
- model.setProperty(RUNTIME_TARGET_ID, newAddition);
- }
- return isOK;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ImportUtil.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ImportUtil.java
deleted file mode 100644
index afa712e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ImportUtil.java
+++ /dev/null
@@ -1,216 +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.jst.j2ee.internal.wizard;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-
-
-
-/**
- * @author Sachin
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class ImportUtil {
-
- public static final int UNKNOWN = 0;
- public static final int EARFILE = 1;
- public static final int EJBJARFILE = 2;
- public static final int WARFILE = 3;
- public static final int CLIENTJARFILE = 4;
- public static final int RARFILE = 5;
- public static final int IMPORTCLASSTYPE = 6;
- public static final int J2EE14 = 256;
- public static final int J2EE13 = 128;
- public static final int J2EE12 = 64;
- public static final int J2EESpec = J2EE12 + J2EE13 + J2EE14;
- public static final String EAR = "EAR"; //$NON-NLS-1$
- public static final String EJB = "EJB"; //$NON-NLS-1$
- public static final String WAR = "WEB"; //$NON-NLS-1$
- public static final String JAR = "CLIENT"; //$NON-NLS-1$
- public static final String RAR = "RAR"; //$NON-NLS-1$
- public static final String[] SUFFIXES = {"", EAR, EJB, WAR, JAR, RAR, ""}; //$NON-NLS-1$ //$NON-NLS-2$
-
- public static int getFileType(String fileName) {
- Archive anArchive = null;
- try {
- try {
- anArchive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
- int archiveType = getArchiveType(anArchive);
- if (archiveType == UNKNOWN && isImportClassType(fileName))
- return IMPORTCLASSTYPE;
- return archiveType;
- } catch (Exception e) {
- if (isImportClassType(fileName))
- return IMPORTCLASSTYPE;
- return UNKNOWN;
- }
- } finally {
- if (anArchive != null && anArchive.isOpen())
- anArchive.close();
- }
- }
-
- //TODO: use new getJ2EEVerions switch statements
- public static int getVersionedFileType(String fileName) {
- Archive anArchive = null;
- try {
- int archiveType = UNKNOWN;
- try {
- anArchive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
- try {
- if (anArchive.isEJBJarFile()) {
- archiveType = EJBJARFILE;
- EJBJar ejbJar = ((EJBJarFile) anArchive).getDeploymentDescriptor();
- if (ejbJar.getVersionID() == J2EEVersionConstants.EJB_1_1_ID)
- archiveType |= J2EE12;
- else if (ejbJar.getVersionID() == J2EEVersionConstants.EJB_2_0_ID)
- archiveType |= J2EE13;
- else if (ejbJar.getVersionID() == J2EEVersionConstants.EJB_2_1_ID)
- archiveType |= J2EE14;
- } else if (anArchive.isWARFile()) {
- archiveType = WARFILE;
- WebApp war = ((WARFile) anArchive).getDeploymentDescriptor();
- if (war.getVersionID() == J2EEVersionConstants.WEB_2_2_ID)
- archiveType |= J2EE12;
- else if (war.getVersionID() == J2EEVersionConstants.WEB_2_3_ID)
- archiveType |= J2EE13;
- else if (war.getVersionID() == J2EEVersionConstants.WEB_2_4_ID)
- archiveType |= J2EE14;
- } else if (anArchive.isApplicationClientFile()) {
- archiveType = CLIENTJARFILE;
- ApplicationClient appClient = ((ApplicationClientFile) anArchive).getDeploymentDescriptor();
- if (appClient.getVersionID() == J2EEVersionConstants.J2EE_1_2_ID)
- archiveType |= J2EE12;
- else if (appClient.getVersionID() == J2EEVersionConstants.J2EE_1_3_ID)
- archiveType |= J2EE13;
- else if (appClient.getVersionID() == J2EEVersionConstants.J2EE_1_4_ID)
- archiveType |= J2EE14;
- } else if (anArchive.isRARFile()) {
- archiveType = RARFILE | J2EE13;
- } else if (anArchive.isEARFile()) {
- archiveType = EARFILE;
- Application app = ((EARFile) anArchive).getDeploymentDescriptor();
- if (app.getVersionID() == J2EEVersionConstants.J2EE_1_2_ID)
- archiveType |= J2EE12;
- else if (app.getVersionID() == J2EEVersionConstants.J2EE_1_3_ID)
- archiveType |= J2EE13;
- else if (app.getVersionID() == J2EEVersionConstants.J2EE_1_4_ID)
- archiveType |= J2EE14;
- }
- } catch (Exception e) {
- //Ignore
- }
-
- } catch (Exception e) {
- //Ignore
- }
- if (archiveType == UNKNOWN && isImportClassType(fileName))
- archiveType = IMPORTCLASSTYPE;
- return archiveType;
- } finally {
- if (anArchive != null && anArchive.isOpen())
- anArchive.close();
- }
- }
-
- public static int getArchiveType(Archive anArchive) {
- int type = UNKNOWN;
- try {
- if (anArchive.isEJBJarFile())
- type = EJBJARFILE;
- else if (anArchive.isWARFile())
- type = WARFILE;
- else if (anArchive.isApplicationClientFile())
- type = CLIENTJARFILE;
- else if (anArchive.isRARFile())
- type = RARFILE;
- else if (anArchive.isEARFile())
- type = EARFILE;
- } catch (Exception e) {
- //Ignore
- }
- return type;
- }
-
- public static boolean isImportClassType(String fileName) {
- File file = new File(fileName);
- String fileExtension = getExtension(file);
- if (file.isFile()) {
- if (fileExtension.equalsIgnoreCase("jar") || //$NON-NLS-1$
- fileExtension.equalsIgnoreCase("zip") || //$NON-NLS-1$
- fileExtension.equalsIgnoreCase("class")) //$NON-NLS-1$
- return true;
- } else if (file.isDirectory()) { //disable/enable drag/drop directories
- return false;
- }
- return false;
- }
-
- public static String getExtension(File f) {
- String ext = null;
- String s = f.getName();
- int i = s.lastIndexOf('.');
-
- if (i > 0 && i < s.length() - 1) {
- ext = s.substring(i + 1).toLowerCase();
- }
- return ext;
- }
-
-
- public static String findMatchingProjectName(String projectName) {
- if (projectName.trim().length() > 0) {
- IWorkspaceRoot root = J2EEPlugin.getWorkspace().getRoot();
- IProject[] projects = root.getProjects();
- String lowerCaseName = projectName.toLowerCase();
- // iterate through all projects a compare lowercase names
- if (projectName == null || projectName.length() == 0) {
- if (projects.length == 1)
- return projects[0].getName();
- return null;
- }
- for (int i = 0; i < projects.length; i++) {
- if (projects[i].exists()) {
- if (WTPPlugin.isPlatformCaseSensitive()) {
- if (projects[i].getName().equals(projectName))
- return projects[i].getName();
- } else {
- if (projects[i].getName().toLowerCase().equals(lowerCaseName))
- return projects[i].getName();
- }
- }
- }
- }
- return projectName;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java
deleted file mode 100644
index c07cfd3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java
+++ /dev/null
@@ -1,285 +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.jst.j2ee.internal.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-
-/**
- * <p>
- * Serves as a base class for the Wizards which create J2EE artifact structures. An Artifact can be
- * a J2EE application, module, or utility component.
- * </p>
- * <p>
- * Creation wizards must define the abstract methods from
- * {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard}which include the following:
- * <ul>
- * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#doAddPages()}
- * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#canFinish()}
- * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#createBaseOperation()}
- * <li>{@link com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#createDefaultModel()}
- * </ul>
- * </p>
- * <p>
- * And optionally, they can override the following methods:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()}
- * <li>{@link #doDispose()}
- * <li>{@link #doSetInitializeData(IConfigurationElement, String, Object)}
- * </ul>
- *
- * @see org.eclipse.wst.common.frameworks.ui.ExtendableWizard
- */
-public abstract class J2EEArtifactCreationWizard extends DataModelWizard implements INewWizard, IExecutableExtension, IPluginContribution {
-
- /**
- * <p>
- * Constant used to identify the key of the main page of the Wizard.
- * </p>
- */
- protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
- private IStructuredSelection selection;
- private IConfigurationElement configurationElement;
-
- /**
- * <p>
- * Creates a default instance of the wizard with no configuration data, no selection, and no
- * operation data model.
- * </p>
- */
- public J2EEArtifactCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate wizard controls and to collect data from the user. The model
- * will eventually be used to run the operation, if the user does not cancel the Wizard.
- * </p>
- *
- * @param model
- * used to collect information and interface with the WTP Operation
- */
- public J2EEArtifactCreationWizard(IDataModel model) {
- super(model);
- }
-
-
- /**
- * <p>
- * The selection is used to pre-populate values in the Wizard dialog controls.
- * </p>
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- *
- * @param workbench
- * the current workbench parent of the wizard
- * @param aSelection
- * the selection from the view used to start the wizard (if any)
- */
- public final void init(IWorkbench workbench, IStructuredSelection aSelection) {
- setNeedsProgressMonitor(true);
- this.selection = aSelection;
- doInit();
- }
-
- /**
- * <p>
- * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
- * wizard completes.
- * </p>
- *
- * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
- */
- public final void dispose() {
- super.dispose();
- doDispose();
- this.selection = 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>
- * Invoked from init(IWorkbench, IStructuredSelection) once the workbench and selection have
- * been safely stored away.
- * </p>
- * <p>
- * No-op by default.
- * </p>
- */
- protected void doInit() {
- // init
- }
-
- /**
- * <p>
- * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
- * </p>
- */
- protected void doDispose() {
- // dispose
- }
-
- /**
- * <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>
- * Default return value is <b>null </b>.
- * </p>
- *
- * @return Returns the ID of the Perspective which is preferred by this wizard upon completion.
- */
- protected String getFinalPerspectiveID() {
- return null;
- }
-
- /**
- *
- * <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 {
- super.postPerformFinish();
- if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
-
- IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
- 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);
- String projName = getDataModel().getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- BasicNewResourceWizard.selectAndReveal(ProjectUtilities.getProject(projName), J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());
- }
-
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
- * @return Returns the saved settings from the previous use of the Wizard
- */
- public final IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
- /**
- * @return Returns the selection from the current view used to spawn the wizard
- */
- protected final IStructuredSelection getSelection() {
- return selection;
- }
-
-
- /**
- * <p>
- * Returns the value specified by {@link #getWizardId()}
- * </p>
- *
- * @return Returns the an id component used for Activity filtering.
- */
- public final String getLocalId() {
- return getWizardID();
- }
-
- /**
- * <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().getDeclaringPluginDescriptor().getUniqueIdentifier() : ""; //$NON-NLS-1$
- }
-
-
-
- protected final IConfigurationElement getConfigurationElement() {
- return configurationElement;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
deleted file mode 100644
index 1a9bb8c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
+++ /dev/null
@@ -1,171 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * <p>
- * Serves as a base class for Wizards which export J2EE artifact structures from Eclipse projects
- * into a deployable form.
- * </p>
- * <p>
- * Subclasses must provide the methods that are required by
- * {@link com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard}.
- * </p>
- * <p>
- * Optionally, subclasses may also override the following methods:
- * <ul>
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- * </p>
- * <p>
- * The base class will ensure that the Wizard is not spawned unless all open editors are in a
- * non-dirty state. Additionally, the selection from the active view which spanwed the wizard will
- * be made available to subclasses via {@link #getSelection()}.
- * </p>
- */
-public abstract class J2EEArtifactExportWizard extends DataModelWizard {
-
- /**
- * <p>
- * Constant used to identify the key of the main page of the Wizard.
- * </p>
- */
- protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
- private IStructuredSelection currentSelection;
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEArtifactExportWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString("67"));//$NON-NLS-1$
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEArtifactExportWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString("67"));//$NON-NLS-1$
- }
-
- /**
- * <p>
- * Invoked from init(IWorkbench, IStructuredSelection) once the workbench and selection have
- * been safely stored away.
- * </p>
- * <p>
- * No-op by default.
- * </p>
- */
- protected void doInit() {
- //init
- }
-
- /**
- * <p>
- * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
- * </p>
- */
- private void doDispose() {
- //dispose
- }
-
- /**
- * <p>
- * The selection is used to pre-populate values in the Wizard dialog controls.
- * </p>
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- *
- * @param workbench
- * the current workbench parent of the wizard
- * @param aSelection
- * the selection from the view used to start the wizard (if any)
- */
- public final void init(IWorkbench workbench, IStructuredSelection selection) {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EXPORT_WIZ_TITLE));
- this.currentSelection = selection;
-
-//TODO: enable selection defaults
-// if (this.currentSelection.size() > 0) {
-// Object element = this.currentSelection.getFirstElement();
-// IProject project = ProjectUtilities.getProject(element);
-// if (project != null) {
-// IDataModel m = getDataModel();
-// Object originalProjectName = m.getProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME);
-// m.setProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, project.getName());
-// if (!m.validateProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME).isOK()) {
-// m.setProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, originalProjectName);
-// }
-// }
-// }
- doInit();
- }
-
- /**
- * <p>
- * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
- * wizard completes.
- * </p>
- *
- * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
- */
- public final void dispose() {
- super.dispose();
- doDispose();
- this.currentSelection = null;
- }
-
- protected final boolean prePerformFinish() {
- if (!CommonEditorUtility.promptToSaveAllDirtyEditors()) {
- return false;
- }
- if (CommonEditorUtility.getDirtyEditors().length != 0) { // all checkboxes were not selected
- return false;
- }
- return super.prePerformFinish();
- }
-
- /**
- * @return Returns the currentSelection.
- */
- protected final IStructuredSelection getSelection() {
- return currentSelection;
- }
-
- /**
- * @return
- */
- protected final J2EEExportPage getMainPage() {
- return (J2EEExportPage) getPage(MAIN_PG);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
deleted file mode 100644
index 08bc374..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
+++ /dev/null
@@ -1,224 +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.jst.j2ee.internal.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-
-/**
- * <p>
- * Serves as a base class for Wizards which import J2EE artifact structures into Eclipse projects.
- * </p>
- * <p>
- * Subclasses must provide the methods that are required by
- * {@see org.eclipse.wst.common.frameworks.internal.ui.WTPWizard}.
- * </p>
- * <p>
- * Optionally, subclasses may also override the following methods:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- * </p>
- * <p>
- * The base class will ensure that the Wizard is not spawned unless all open editors are in a
- * non-dirty state. Additionally, the selection from the active view which spanwed the wizard will
- * be made available to subclasses via {@link #getCurrentSelection()}.
- * </p>
- */
-public abstract class J2EEArtifactImportWizard extends DataModelWizard implements IImportWizard, IExecutableExtension {
-
- /**
- * <p>
- * Constant used to identify the key of the main page of the Wizard.
- * </p>
- */
- protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
- private static final String FINAL_PERSPECTIVE_ID = "org.eclipse.jst.j2ee.J2EEPerspective"; //$NON-NLS-1$
-
- private IConfigurationElement configurationElement;
- private IStructuredSelection selection;
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEArtifactImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEArtifactImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * The selection is used to pre-populate values in the Wizard dialog controls.
- * </p>
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- *
- * @param workbench
- * the current workbench parent of the wizard
- * @param aSelection
- * the selection from the view used to start the wizard (if any)
- */
- public final void init(IWorkbench workbench, IStructuredSelection aSelection) {
- this.selection = aSelection;
- doInit();
- }
-
- /**
- * <p>
- * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
- * wizard completes.
- * </p>
- *
- * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
- */
- public final void dispose() {
- super.dispose();
- doDispose();
- this.selection = null;
- this.configurationElement = null;
- }
-
-
- /**
- * <p>
- * Invoked after the selection has been saved off in
- * {@link #init(IWorkbench, IStructuredSelection)}. Should be used to handle any specific
- * Wizard initialization.
- * </p>
- */
- protected void doInit() {
- // init
- }
-
- /**
- * <p>
- * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
- * </p>
- */
- protected void doDispose() {
- // dispose
- }
-
- /**
- * <p>
- * The return value of this method will be used to suggest a final perspective to the user once
- * the wizard completes.
- * </p>
- *
- * @return Returns the J2EE Perpsective ID by default
- */
- protected String getFinalPerspectiveID() {
- return FINAL_PERSPECTIVE_ID;
- }
-
- /**
- * <p>
- * Prompts the user to save open, dirty editors.
- * </p>
- *
- * @return true only if all editors are saved
- */
- protected final boolean prePerformFinish() {
- if (!CommonEditorUtility.promptToSaveAllDirtyEditors()) {
- return false;
- }
- if (CommonEditorUtility.getDirtyEditors().length != 0) { // all checkboxes were not
- // selected
- return false;
- }
- return super.prePerformFinish();
- }
-
- /**
- * <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 final void postPerformFinish() throws InvocationTargetException {
- super.postPerformFinish();
- if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
-
- IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
- 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);
- }
-
- /**
- * {@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 {@see #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 config, String propertyName, Object data) throws CoreException {
- this.configurationElement = config;
- }
-
-
- /**
- * @return Returns the selection.
- */
- protected final IStructuredSelection getSelection() {
- return selection;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java
deleted file mode 100644
index 27a56e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java
+++ /dev/null
@@ -1,196 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-
-/**
- * <p>
- * Serves as a base class for Wizards which create J2EE module structures in Eclipse projects.
- * </p>
- * <p>
- * The EAR will be pre-populated in the Wizard controls if any selection was provided to the Wizard.
- * </p>
- * <p>
- * Refer to {@link org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactCreationWizard}for information
- * on how to extend this class.
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactCreationWizard
- */
-public abstract class J2EEComponentCreationWizard extends J2EEArtifactCreationWizard implements IJ2EEComponentCreationDataModelProperties {
-
- /**
- * <p>
- * Constant used to identify the key of the main page of the Wizard.
- * </p>
- */
- protected static final String MODULE_PG = "module"; //$NON-NLS-1$
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEComponentCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEComponentCreationWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * The selection stored in
- * {@link J2EEArtifactCreationWizard#init(IWorkbench, IStructuredSelection)}is used to
- * pre-populate the EAR project in the Wizard dialog controls.
- * </p>
- *
- * @see J2EEArtifactCreationWizard#init(IWorkbench, IStructuredSelection)
- * @see J2EEArtifactCreationWizard#doInit()
- */
- protected void doInit() {
- preFillSelectedEARProject();
- }
-
- /**
- * <p>
- * Subclasses which override this method should always call super.addModulesPageIfNecessary()
- * ahead of before their own pages.
- * </p>
- *
- */
- protected void addModulesPageIfNecessary() {
- // TODO: add modules page back for 0.7
- // if (getDataModel().getBooleanProperty(UI_SHOW_EAR_SECTION)) {
- // addPage(new J2EEModulesDependencyPage(getDataModel(), MODULE_PG));
- // }
- }
-
- /**
- * @inheritDoc
- *
- * @see org.eclipse.jface.wizard.IWizard#addPages()
- */
- protected void doAddPages() {
- addModulesPageIfNecessary();
- }
-
- /**
- * <p>
- * Skips the page identified by the MODULE_PG name if
- * {@link J2EEComponentCreationWizard#shouldShowModulesPage()}is false.
- * </p>
- */
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName) {
- if (!shouldShowModulesPage() && expectedPreviousPageName.equals(MODULE_PG)) {
- return IDMPageHandler.PAGE_BEFORE;
- }
- return super.getPreviousPage(currentPageName, expectedPreviousPageName);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Skips the page identified by the MODULE_PG name if
- * {@link J2EEModuleProjectCreationWizard#shouldShowModulesPage()}is false.
- * </p>
- */
- public String getNextPage(String currentPageName, String expectedNextPageName) {
- if (!shouldShowModulesPage() && (null != expectedNextPageName && expectedNextPageName.equals(MODULE_PG))) {
- return IDMPageHandler.PAGE_AFTER;
- }
- return super.getNextPage(currentPageName, expectedNextPageName);
- }
-
- /**
- * <p>
- * Uses the model to determine if the module page should be shown. The default is to AND the
- * values of model.getBooleanProperty(J2EEModuleCreationDataModel.ADD_TO_EAR) and
- * shouldShowModulesPageForEAR().
- * </p>
- *
- * @return Returns a boolean true if the module page should be shown.
- */
- protected final boolean shouldShowModulesPage() {
- return getDataModel().getBooleanProperty(ADD_TO_EAR) && shouldShowModulesPageForEAR();
- }
-
- /**
- * <p>
- * Uses the model to determine if the module page should be shown for the EAR. If no modules are
- * present in the classpath selection of the model, the method will return false.
- * </p>
- *
- * @return true only if the
- * @see J2EEModuleCreationDataModelOld#getClassPathSelection() is non-empty.
- */
- protected final boolean shouldShowModulesPageForEAR() {
- // TODO is this what we want here?
- return true;
- }
-
- /**
- * @return Returns the EAR module selected in the view used to launch the wizard.
- */
- protected IVirtualComponent getSelectedEARModule() {
- IStructuredSelection selection = getSelection();
- if (null != selection) {
- Object obj = selection.getFirstElement();
- if (obj instanceof EObject) {
- IVirtualComponent comp = ComponentUtilities.findComponent((EObject) obj);
- if (null != comp && J2EEProjectUtilities.isEARProject(comp.getProject())) {
- return comp;
- }
- }
- }
- return null;
- }
-
- protected void preFillSelectedEARProject() {
- IVirtualComponent earComponent = getSelectedEARModule();
- if (earComponent != null) {
- EARArtifactEdit earEdit = null;
- int j2eeVersion = 0;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(earComponent);
- j2eeVersion = earEdit.getJ2EEVersion();
- } finally {
- if (earEdit != null)
- earEdit.dispose();
- }
- IDataModel dm = getDataModel();
- dm.setIntProperty(COMPONENT_VERSION, j2eeVersion);
- dm.setProperty(EAR_COMPONENT_NAME, earComponent.getName());
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java
deleted file mode 100644
index dc936c2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java
+++ /dev/null
@@ -1,559 +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
- *******************************************************************************/
-/*
- * Created on Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Point;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-
-
-public abstract class J2EEComponentCreationWizardPage extends DataModelWizardPage implements IJ2EEComponentCreationDataModelProperties{
-
- private static final boolean isWindows = SWT.getPlatform().toLowerCase().startsWith("win"); //$NON-NLS-1$
- protected static final String MODULE_VERSION = J2EEUIMessages.MODULE_VERSION_LABEL;
- protected NewModuleGroup projectNameGroup;
- protected Composite advancedComposite;
- protected Button advancedButton;
- protected boolean showAdvanced = false;
- protected AdvancedSizeController advancedController;
- protected boolean advancedControlsBuilt = false;
- protected ServerEarAndStandaloneGroup earGroup;
- protected Combo serverTargetCombo;
- protected Text moduleNameText = null;
- protected Text locationPathField = null;
- protected Button browseButton = null;
- protected Button supportMultipleModules = null;
- protected Combo projectNameCombo = null;
- protected Text sourceFolderNameText = null;
-
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-// private static final String NEW_LABEL_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E); //$NON-NLS-1$
- private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL); //$NON-NLS-1$
- private String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL); //$NON-NLS-1$
- private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
- /**
- * This type is responsible for setting the Shell size based on the showAdvanced flag. It will
- * track the original size of the Shell even if the user resizes it. One problem that we may
- * face is that the Shell size could change by the framework prior to the Shell being made
- * visible but the page will already get an enter call. This means that we will need to set the
- * Shell size based on the showAdvanced flag when the Shell resize event is called and the Shell
- * is visible.
- */
- private class AdvancedSizeController implements ControlListener {
- private int advancedHeight = -1;
- private Point originalSize;
- private boolean ignoreShellResize = false;
-
- private AdvancedSizeController(Shell aShell) {
- originalSize = aShell.getSize();
- aShell.addControlListener(this);
- }
-
- public void controlMoved(ControlEvent e) {
- //do nothing
- }
-
- public void controlResized(ControlEvent e) {
- if (!ignoreShellResize) {
- Control control = (Control) e.getSource();
- if (control.isVisible()) {
- originalSize = control.getSize();
- if (advancedHeight == -1)
- setShellSizeForAdvanced();
- }
- }
- }
-
- protected void resetOriginalShellSize() {
- setShellSize(originalSize.x, originalSize.y);
- }
-
- private void setShellSize(int x, int y) {
- ignoreShellResize = true;
- try {
- getShell().setSize(x, y);
- } finally {
- ignoreShellResize = false;
- }
- }
-
- protected void setShellSizeForAdvanced() {
- int height = calculateAdvancedShellHeight();
- if (height != -1)
- setShellSize(getShell().getSize().x, height);
- }
-
- private int calculateAdvancedShellHeight() {
- Point advancedCompSize = advancedComposite.getSize();
- if (advancedCompSize.x == 0)
- return -1;
- int height = computeAdvancedHeight();
- if (!showAdvanced && height != -1)
- height = height - advancedComposite.getSize().y;
- return height;
- }
-
- /*
- * Compute the height with the advanced section showing. @return
- */
- private int computeAdvancedHeight() {
- if (advancedHeight == -1) {
- Point controlSize = getControl().getSize();
- if (controlSize.x != 0) {
- Point pageSize = getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- int minHeight = originalSize.y - controlSize.y;
- advancedHeight = pageSize.y + minHeight;
- }
- }
- return advancedHeight;
- }
- }
-
- public J2EEComponentCreationWizardPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite top = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(top, getInfopopID());
- top.setLayout(new GridLayout());
- top.setData(new GridData(GridData.FILL_BOTH));
- Composite composite = new Composite(top, SWT.NONE);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createModuleGroup(composite);
- Composite detail = new Composite(top, SWT.NONE);
- detail.setLayout(new GridLayout());
- detail.setData(new GridData(GridData.FILL_BOTH));
- createAdvancedComposite(detail);
- return top;
- }
-
- protected Composite createAdvancedComposite(Composite parent) {
- advancedControlsBuilt = true;
- advancedButton = new Button(parent, SWT.TOGGLE);
- setAdvancedLabelText();
- final Cursor hand = new Cursor(advancedButton.getDisplay(), SWT.CURSOR_HAND);
- advancedButton.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- hand.dispose();
- }
- });
- advancedComposite = new Composite(parent, SWT.NONE);
- //toggleAdvanced(false);
- GridLayout layout = new GridLayout(3, false);
- GridData data = new GridData();
- advancedComposite.setData(data);
- advancedComposite.setLayout(layout);
- advancedButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- toggleAdvanced(true);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //do nothing
- }
- });
- advancedButton.addListener(SWT.MouseHover, new Listener() {
- public void handleEvent(Event event) {
- if (event.type == SWT.MouseHover)
- advancedButton.setCursor(hand);
- }
- });
- addToAdvancedComposite(advancedComposite);
- return advancedComposite;
- }
-
- protected void createModuleGroup(Composite parent) {
- createProjectNameGroup(parent);
- createProjectLocationGroup(parent);
- }
-
- /**
- *
- */
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(MODULE_NAME_UI);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- moduleNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- moduleNameText.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(moduleNameText, COMPONENT_NAME, new Control[]{projectNameLabel});
- moduleNameText.setFocus();
- }
-
- /**
- *
- */
- private void createProjectLocationGroup(Composite parent) {
- // set up location path label
- Label locationPathLabel = new Label(parent, SWT.NONE);
- locationPathLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOC_LBL));
- GridData data = new GridData();
- locationPathLabel.setLayoutData(data);
- // set up location path entry field
- locationPathField = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- locationPathField.setLayoutData(data);
- // set up browse button
- browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleLocationBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
- locationPathField.setEditable(true);
- synchHelper.synchText(locationPathField, LOCATION, null);
- }
- /**
- * Open an appropriate directory browser
- */
- protected void handleLocationBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
- dialog.setMessage(defDirDialogLabel);
- String dirName = getDataModel().getStringProperty(LOCATION);
- if ((dirName != null) && (dirName.length() != 0)) {
- File path = new File(dirName);
- if (path.exists()) {
- dialog.setFilterPath(dirName);
- }
- }
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- getDataModel().setProperty(LOCATION, selectedDirectory);
- }
- }
-
- protected void addToAdvancedComposite(Composite advanced) {
- createServerTargetComposite(advanced);
- createVersionComposite(advanced);
- createServerEarAndStandaloneGroup(advanced);
- }
-
-
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- serverTargetCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Button newServerTargetButton = new Button(parent, SWT.NONE);
- newServerTargetButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E));
- newServerTargetButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if(!J2EEComponentCreationWizardPage.launchNewRuntimeWizard(getShell(), model)){
- setErrorMessage(J2EECreationResourceHandler.ServerTargetDataModel_UI_9);
- }
- }
- });
- Control[] deps = new Control[]{label, newServerTargetButton};
- synchHelper.synchCombo(serverTargetCombo, RUNTIME_TARGET_ID, deps);
- if(serverTargetCombo.getSelectionIndex() == -1 && serverTargetCombo.getVisibleItemCount() != 0)
- serverTargetCombo.select(0);
- }
-
- protected void createServerEarAndStandaloneGroup(Composite parent) {
- earGroup = new ServerEarAndStandaloneGroup(parent, getDataModel(), synchHelper);
- }
- /**@deprecated
- * If this method is not used it should be removed at a later time, marking as deprecated
- * Warning cleanup 12/07/2005
- */
- private void createProjectsComboGroup(Composite parent) {
- // set up project name label
-
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT));
-
- // set up project name entry field
- projectNameCombo = new Combo(parent, SWT.NONE | SWT.READ_ONLY);
- projectNameCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- projectNameCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String projectName = projectNameCombo.getText();
-
- //update the project location with this information, make it readable
- //update Server info RUNTIME_TARGET_ID, make it readable
- if (projectName!=null && projectName.length()!=0) {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project !=null) {
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null){
- //serverTargetText.setText(runtime.getName());
- synchHelper.getDataModel().setProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID, runtime.getName());
- }
- synchHelper.getDataModel().setProperty(IComponentCreationDataModelProperties.PROJECT_NAME, projectName);
- synchHelper.getDataModel().setProperty(IComponentCreationDataModelProperties.LOCATION, project.getLocation().toOSString());
- }
- }
-
- }
- });
- }
-
- /**
- * @return
- */
-// private IProject getSelectedProject() {
-// IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-// if (window == null)
-// return null;
-// ISelection selection = window.getSelectionService().getSelection();
-// if (selection == null || !(selection instanceof StructuredSelection))
-// return null;
-// StructuredSelection stucturedSelection = (StructuredSelection) selection;
-// Object obj = stucturedSelection.getFirstElement();
-// if (obj instanceof IProject)
-// return (IProject) obj;
-// return null;
-// }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{IComponentCreationDataModelProperties.PROJECT_NAME, RUNTIME_TARGET_ID, COMPONENT_VERSION, COMPONENT_NAME, LOCATION, EAR_COMPONENT_NAME, ADD_TO_EAR, JAVASOURCE_FOLDER }; }
-
- protected void createSourceFolderComposite(Composite parent) {
-
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- separator.setLayoutData(gd);
-
- Label label = new Label(parent, SWT.NONE);
- label.setText(getSourceFolderLabel());
- GridData data = new GridData();
- label.setLayoutData(data);
- // set up project name entry field
- sourceFolderNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- sourceFolderNameText.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(sourceFolderNameText, JAVASOURCE_FOLDER, null);
- }
-
-
- protected void createVersionComposite(Composite parent) {
- createVersionComposite(parent, getVersionLabel(), COMPONENT_VERSION);
- }
-
- protected String getVersionLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.MODULE_VERSION_LABEL);
- }
-
- protected String getSourceFolderLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.SOURCEFOLDER);
- }
-
- public void dispose() {
- super.dispose();
- if (earGroup != null)
- earGroup.dispose();
- if (projectNameGroup != null)
- projectNameGroup.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
- */
- protected void enter() {
- if (advancedControlsBuilt) {
- if (isFirstTimeToPage)
- initializeAdvancedController();
- if (isWindows) {
- advancedController.setShellSizeForAdvanced();
- }
- }
- super.enter();
- }
-
- private void initializeAdvancedController() {
- advancedController = new AdvancedSizeController(getShell());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#exit()
- */
- protected void exit() {
- if (advancedControlsBuilt && isWindows && advancedController!=null) {
- advancedController.resetOriginalShellSize();
- }
- super.exit();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#storeDefaultSettings()
- */
- public void storeDefaultSettings() {
- super.storeDefaultSettings();
- if (advancedControlsBuilt) {
- IDialogSettings settings = getDialogSettings();
- if (settings != null)
- settings.put(getShowAdvancedKey(), showAdvanced);
- }
- }
-
- protected String getShowAdvancedKey() {
- return getClass().getName() + "_SHOW_ADVANCED"; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#restoreDefaultSettings()
- */
- protected void restoreDefaultSettings() {
- super.restoreDefaultSettings();
- if (advancedControlsBuilt) {
- IDialogSettings settings = getDialogSettings();
- if (settings != null)
- showAdvanced = !settings.getBoolean(getShowAdvancedKey());
- advancedButton.setSelection(!showAdvanced); //set opposite b/c toggleAdvanced(boolean)
- // will flip it
- toggleAdvanced(false);
- }
- }
-
- /**
- * @param advancedLabel
- */
- private void setAdvancedLabelText() {
- if (advancedControlsBuilt) {
- if (showAdvanced)
- advancedButton.setText(J2EEUIMessages.getResourceString("J2EEProjectCreationPage_UI_0")); //$NON-NLS-1$
- else
- advancedButton.setText(J2EEUIMessages.getResourceString("J2EEProjectCreationPage_UI_1")); //$NON-NLS-1$
- }
- }
-
- /**
- * @param advancedLabel
- */
- protected void toggleAdvanced(boolean setSize) {
- if (advancedControlsBuilt) {
- showAdvanced = !showAdvanced;
- advancedComposite.setVisible(showAdvanced);
- setAdvancedLabelText();
- if (setSize && isWindows) {
- if (advancedControlsBuilt) {
- if (advancedController == null)
- initializeAdvancedController();
- if (isWindows) {
- advancedController.setShellSizeForAdvanced();
- }
- }
-// advancedController.setShellSizeForAdvanced();
- }
- }
- }
-
- protected void createVersionComposite(Composite parent, String labelText, String versionProp) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(labelText);
- Combo versionCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.widthHint = 305;
- versionCombo.setLayoutData(gridData);
- Control[] deps = new Control[]{label};
- synchHelper.synchCombo(versionCombo, versionProp, deps);
- if (versionCombo.getSelectionIndex() == -1) {
- String[] items = versionCombo.getItems();
- if (items != null && items.length > 0)
- versionCombo.select(items.length - 1);
- }
- new Label(parent, SWT.NONE); //pad
- }
-
-
-
- public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
- DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
- boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (isOK && model != null) {
-
- DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
- 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 = ProjectUtilities.getNewObject(preAddition, postAddition);
-
- model.notifyPropertyChange(RUNTIME_TARGET_ID, IDataModel.VALID_VALUES_CHG);
- if (newAddition != null)
- model.setProperty(RUNTIME_TARGET_ID, newAddition);
- else
- return false;
- }
- return isOK;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
deleted file mode 100644
index 0146370..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
+++ /dev/null
@@ -1,117 +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
- *******************************************************************************/
-/*
- * Created on Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public abstract class J2EEComponentFacetCreationWizardPage extends DataModelFacetCreationWizardPage implements IFacetProjectCreationDataModelProperties {
-
- private static final String STORE_LABEL = "LASTEARNAME_"; //$NON-NLS-1$
-
- protected EarSelectionPanel earPanel;
-
- public J2EEComponentFacetCreationWizardPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- }
-
- 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);
- Composite composite = new Composite(top, SWT.NONE);
- composite.setLayoutData(gdhfill());
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createServerTargetComposite(composite);
- createEarComposite(composite);
- return top;
- }
-
- private void createEarComposite(Composite composite) {
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
- IDataModel facetModel = (IDataModel) map.get(getModuleFacetID());
- earPanel = new EarSelectionPanel(facetModel, composite);
- }
-
- protected abstract String getModuleFacetID();
-
- public void dispose() {
- super.dispose();
- if (earPanel != null)
- earPanel.dispose();
- }
-
- public void storeDefaultSettings() {
- super.storeDefaultSettings();
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- String facetID = getModuleFacetID();
- IDataModel j2eeModel = map.getFacetDataModel(facetID);
- if(j2eeModel.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)){
- String lastEARName = j2eeModel.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- settings.put(STORE_LABEL, lastEARName);
- }
- }
- }
-
- public void restoreDefaultSettings() {
- super.restoreDefaultSettings();
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String lastEARName = settings.get(STORE_LABEL);
- if (lastEARName != null){
- FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- String facetID = getModuleFacetID();
- IDataModel j2eeModel = map.getFacetDataModel(facetID);
- j2eeModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.LAST_EAR_NAME, lastEARName);
- }
- }
- }
-
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
- protected String[] getValidationPropertyNames() {
- String[] superProperties = super.getValidationPropertyNames();
- List list = Arrays.asList(superProperties);
- ArrayList arrayList = new ArrayList();
- arrayList.addAll( list );
- arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME );
- arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR );
- return (String[])arrayList.toArray( new String[0] );
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java
deleted file mode 100644
index dab3960..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java
+++ /dev/null
@@ -1,155 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <p>
- * Serves as a base class for Wizards which import J2EE module structures into Eclipse projects.
- * </p>
- * <p>
- * Import wizards must define the following methods:
- * <ul>
- * <li>{@link #getImportOperation()}
- * <li>{@link #getModuleValidatorStrings()}
- * </ul>
- * </p>
- * <p>
- * And optionally, they may override the following methods from
- * {@see org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactImportWizard}:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- */
-public abstract class J2EEComponentImportWizard extends J2EEArtifactImportWizard implements IImportWizard, IExecutableExtension {
-
-// private static final String[] VALIDATOR_STRINGS = new String[]{"org.eclipse.jst.j2ee.internal.validation.UIEarValidator"}; //$NON-NLS-1$
-
-// private static final Class IPROJECT_CLASS = IProject.class;
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEComponentImportWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEComponentImportWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString("38"));//$NON-NLS-1$
- }
-
- // /**
- // * <p>
- // * Creates an Import Operation using {@link #getImportOperation()}and wraps it to run
- // * validation once the module has been imported.
- // * </p>
- // *
- // * @return Returns a wrapper operation around the result of getImportOperation() that also
- // runs
- // * validation as defined in getModuleValidatorStrings()
- // * @see #getImportOperation()
- // * @see #getModuleValidatorStrings()
- // */
- // protected final WTPOperation createBaseOperation() {
- // return new WTPOperation() {
- // protected void execute(IProgressMonitor monitor) throws CoreException,
- // InvocationTargetException, InterruptedException {
- // WTPOperation importOp = getImportOperation();
- // if (importOp == null)
- // return;
- // importOp.run(monitor);
- //
- // J2EEModuleImportDataModel importModel = (J2EEModuleImportDataModel)
- // getImportOperation().getOperationDataModel();
- // IProject moduleProject = importModel.getProject();
- // ValidatorSubsetOperation moduleValidator = new ValidatorSubsetOperation(moduleProject, true,
- // false);
- // moduleValidator.setValidators(getModuleValidatorStrings());
- // moduleValidator.run(monitor);
- //
- // if (importModel.getBooleanProperty(J2EEModuleImportDataModel.ADD_TO_EAR)) {
- // IProject earProject =
- // importModel.getJ2EEModuleCreationDataModel().getEarComponentCreationDataModel().getTargetProject();
- // ValidatorSubsetOperation earValidator = new ValidatorSubsetOperation(earProject, true,
- // false);
- // earValidator.setValidators(getEarValidatorStrings());
- // earValidator.run(monitor);
- // }
- // }
- // };
- // }
-
- // /**
- // *
- // * @return The appropriate import operation for the specific J2EE model type
- // */
- // protected abstract WTPOperation getImportOperation();
-
- /**
- * <p>
- * The Import Wizards can run arbitrary validators once the module has been created. These
- * validators ensure that the structure created by the Import operation and the contents of that
- * structure are valid. Any errors will be announced to the Problems view in Eclipse.
- * </p>
- *
- * @return An array of validator IDs that should be used for this module type
- */
- protected abstract String[] getModuleValidatorStrings();
-
- // /**
- // * <p>
- // * Uses the selection supplied from the {@link #init(IWorkbench, IStructuredSelection)}method
- // * to set the associated EAR Module if an EAR artifact was selected.
- // * </p>
- // *
- // * @param importModel
- // * The Module Import data model to have its J2EEModuleImportDataModel.EAR_PROJECT
- // * field set.
- // */
- // protected final void updateEARToModelFromSelection(J2EEModuleImportDataModel importModel) {
- // /* Set the default ear selected if a ear is selected */
- // try {
- // if (getSelection() != null && !getSelection().isEmpty()) {
- // IProject targetEARProject = (IProject)
- // AdaptabilityUtility.getAdapter(getSelection().getFirstElement(), IPROJECT_CLASS);
- // if (targetEARProject != null && targetEARProject.hasNature(IEARNatureConstants.NATURE_ID))
- // importModel.setProperty(J2EEModuleImportDataModel.EAR_NAME, targetEARProject.getName());
- // }
- // } catch (Exception e) {
- // //Ignore
- // }
- // }
-
- // private String[] getEarValidatorStrings() {
- // return VALIDATOR_STRINGS;
- // }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java
deleted file mode 100644
index cff0050..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEComponentLabelProvider implements ILabelProvider {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- public Image getImage(Object element) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- public String getText(Object element) {
-// if (element instanceof IVirtualComponent) {
-// return ((IVirtualComponent)element).getName();
-// }
- if (element instanceof IProject) {
- IProject handle = (IProject)element;
- return handle.getName();
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- // TODO Auto-generated method stub
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java
deleted file mode 100644
index 11928ab..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java
+++ /dev/null
@@ -1,384 +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
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-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.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEExportPage extends DataModelWizardPage {
-
- public static boolean isWindows = SWT.getPlatform().toLowerCase().startsWith("win"); //$NON-NLS-1$
-
- protected IStructuredSelection currentResourceSelection;
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- private static final String STORE_LABEL = "J2EE_EXPORT_"; //$NON-NLS-1$
- private static final String OVERWRITE_LABEL = "OVERWRITE"; //$NON-NLS-1$
- private static final String SOURCE_LABEL = "SOURCE"; //$NON-NLS-1$
-// private static final String META_LABEL = "META"; //$NON-NLS-1$
- protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL);
- protected String LABEL_DESTINATION = J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_DESTINATION);
- private Combo resourceNameCombo;
- private Combo destinationNameCombo;
- private Button destinationBrowseButton;
- protected Button overwriteExistingFilesCheckbox;
- private Button sourceFilesCheckbox;
-
- /**
- * @param model
- * @param pageName
- */
- public J2EEExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName);
- currentResourceSelection = selection;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- //WorkbenchHelp.setHelp(composite, getInfopopID());
- GridLayout layout = new GridLayout(1, false);
- composite.setLayout(layout);
-
- createSourceAndDestinationGroup(composite);
- createOptionsGroup(composite);
-
- //setupBasedOnInitialSelections();
- setupInfopop(composite);
- return composite;
- }
-
- /**
- * @param composite
- */
- private void createSourceAndDestinationGroup(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createExportComponentGroup(composite);
- createDestinationGroup(composite);
-
- }
- /**
- * Creates the export source resource specification widgets.
- *
- * @param parent
- * a <code>Composite</code> that is to be used as the parent of this group's
- * collection of visual components
- * @see org.eclipse.swt.widgets.Composite
- */
- protected void createExportComponentGroup(Composite parent) {
- //Project label
- Label projectLabel = new Label(parent, SWT.NONE);
- projectLabel.setText(getComponentLabel());
- //Project combo
- resourceNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- resourceNameCombo.setLayoutData(data);
- synchHelper.synchCombo(resourceNameCombo, IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, null);
- new Label(parent, SWT.NONE);//Pad label
- }
-
- /**
- * @return
- */
- protected abstract String getComponentLabel();
-
- protected void createDestinationGroup(org.eclipse.swt.widgets.Composite parent) {
-
- //Destination label
- Label destinationLabel = new Label(parent, SWT.NONE);
- destinationLabel.setText(LABEL_DESTINATION);
- // destination name combo field
- destinationNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- destinationNameCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchCombo(destinationNameCombo, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, null);
-
- // destination browse button
- destinationBrowseButton = new Button(parent, SWT.PUSH);
- destinationBrowseButton.setText(defBrowseButtonLabel); //$NON-NLS-1$
- destinationBrowseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- destinationBrowseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleDestinationBrowseButtonPressed();
- }
- });
- destinationBrowseButton.setEnabled(true);
-
- }
-
- /**
- * Create the export options specification widgets.
- *
- * @param parent
- * org.eclipse.swt.widgets.Composite
- */
- protected void createOptionsGroup(Composite parent) {
-
- // options group
- Composite optionsGroup = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(1, false);
- optionsGroup.setLayout(layout);
-
-
- // source files... checkbox
- createSourceFilesCheckbox(optionsGroup);
-
- // overwrite... checkbox
- createOverwriteExistingFilesCheckbox(optionsGroup);
-
- // advanced button
- if (shouldShowProjectFilesCheckbox()) {
- createProjectFilesCheckbox(optionsGroup);
- }
- }
-
- protected void createOverwriteExistingFilesCheckbox(Composite optionsGroup) {
- //Overwrite checkbox
- overwriteExistingFilesCheckbox = new Button(optionsGroup, SWT.CHECK | SWT.LEFT);
- overwriteExistingFilesCheckbox.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_OVERWRITE_CHECKBOX)); //$NON-NLS-1$ = "Overwrite existing files without warning"
- overwriteExistingFilesCheckbox.setEnabled(true);
- synchHelper.synchCheckbox(overwriteExistingFilesCheckbox, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING, null);
- }
-
- protected void createSourceFilesCheckbox(Composite optionsGroup) {
- sourceFilesCheckbox = new Button(optionsGroup, SWT.CHECK | SWT.LEFT);
- sourceFilesCheckbox.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_SOURCE_CHECKBOX)); //$NON-NLS-1$
- synchHelper.synchCheckbox(sourceFilesCheckbox, IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES, null);
- }
-
- /**
- * @return
- */
- protected boolean shouldShowProjectFilesCheckbox() {
- return false;
- }
-
- protected void createProjectFilesCheckbox(Composite composite) {
- //do nothing
- }
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected void setupBasedOnInitialSelections() {
-
- if (currentResourceSelection.isEmpty() || setupBasedOnRefObjectSelection())
- return; // no setup needed
-
- java.util.List selections = new ArrayList();
- Iterator aenum = currentResourceSelection.iterator();
- while (aenum.hasNext()) {
- IResource currentResource = (IResource) aenum.next();
- // do not add inaccessible elements
- if (currentResource.isAccessible())
- selections.add(currentResource);
- }
- if (selections.isEmpty())
- return; // setup not needed anymore
-
-// int selectedResourceCount = selections.size();
-//TODO: find a way to select an existing component
-// if (selectedResourceCount == 1) {
-// IResource resource = (IResource) selections.get(0);
-// if ((resource instanceof IProject) && checkForNature((IProject) resource)) {
-// resourceNameCombo.setText(resource.getName().toString());
-// }
-// }
- }
-
- /**
- * @return
- */
- protected String getProjectImportLabel() {
- return null;
- }
-
- /**
- *
- */
- protected void handleDestinationBrowseButtonPressed() {
-
- FileDialog dialog = new FileDialog(destinationNameCombo.getShell(), SWT.SAVE);
- String fileName = getDataModel().getStringProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME);
- String[] filters = getFilterExpression();
- if (!isWindows) {
- if (filters.length != 0 && filters[0] != null && filters[0].indexOf('.') != -1) {
- fileName += filters[0].substring(filters[0].indexOf('.'));
- }
- }
- dialog.setFileName(fileName);
- if (isWindows) {
- dialog.setFilterExtensions(filters);
- }
- String filename = dialog.open();
- if (filename != null)
- destinationNameCombo.setText(filename);
- }
-
- protected void restoreWidgetValues() {
-
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null)
- return; // ie.- no settings stored
- for (int i = 0; i < sourceNames.length; i++) {
- if (sourceNames[i] == null)
- sourceNames[i] = ""; //$NON-NLS-1$
- }
- destinationNameCombo.setItems(sourceNames);
- boolean overwrite = settings.getBoolean(STORE_LABEL + OVERWRITE_LABEL);
- model.setBooleanProperty(IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING, overwrite);
- boolean includeSource = settings.getBoolean(STORE_LABEL + SOURCE_LABEL);
- model.setBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES, includeSource);
- }
- }
-
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- // update source names history
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null) {
- sourceNames = new String[0];
- }
-
- String newName = destinationNameCombo.getText();
-
- //rip out any empty filenames and trim length to 5
- ArrayList newNames = new ArrayList();
- for (int i = 0; i < sourceNames.length && i < 5; i++) {
- if (sourceNames[i].trim().length() > 0 && !newName.equals(sourceNames[i])) {
- newNames.add(sourceNames[i]);
- }
- }
- newNames.add(0, destinationNameCombo.getText());
- sourceNames = new String[newNames.size()];
- newNames.toArray(sourceNames);
-
- settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
- settings.put(STORE_LABEL + OVERWRITE_LABEL, model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING));
- settings.put(STORE_LABEL + SOURCE_LABEL, model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES));
- }
- }
-
- /**
- * @return
- */
- protected String getFileNamesStoreID() {
- return getCompnentID();
- }
- protected abstract String getCompnentID();
-
- /**
- * @return
- */
- protected String[] getFilterExpression() {
- return new String[0];
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
- */
- protected void enter() {
- super.enter();
- restoreWidgetValues();
- }
-
- /**
- * @return
- */
- //protected abstract String getNatureID();
-
- protected abstract boolean isMetaTypeSupported(Object o);
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected boolean setupBasedOnRefObjectSelection() {
-
- if (currentResourceSelection.size() != 1)
- return false;
-
- Object o = currentResourceSelection.getFirstElement();
- if (!isMetaTypeSupported(o))
- return false;
-
- EObject ref = (EObject) o;
- IResource resource = ProjectUtilities.getProject(ref);
- if (resource != null) {
- resourceNameCombo.setText(resource.getName().toString());
- }
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
- */
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
deleted file mode 100644
index 5941ce2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
+++ /dev/null
@@ -1,278 +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.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-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.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public abstract class J2EEImportPage extends DataModelWizardPage {
-
- private Combo componentCombo;
- private Combo fileNameCombo;
- private static final String STORE_LABEL = "J2EE_IMPORT_"; //$NON-NLS-1$
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL); //$NON-NLS-1$
-// private static final String defNewButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E); //$NON-NLS-1$
-
- /**
- * @param model
- * @param pageName
- */
- public J2EEImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createFileNameComposite(composite);
- createProjectNameComposite(composite);
- restoreWidgetValues();
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createProjectNameComposite(Composite parent) {
-// if (FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp()) {
-// new NewModuleDataModelGroup(parent, getDataModel(), synchHelper);
-// } else {
- Label componentLabel = new Label(parent, SWT.NONE);
-
- componentLabel.setText(getProjectImportLabel());
- componentLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- // setting up combo
- componentCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- componentCombo.setLayoutData(data);
-
- // // setting up button
- // Button newProjectButton = new Button(parent, SWT.PUSH);
- // newProjectButton.setText(defNewButtonLabel); //$NON-NLS-1$
- // newProjectButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- // newProjectButton.addSelectionListener(new SelectionAdapter() {
- // public void widgetSelected(SelectionEvent e) {
- // // handleNewProjectButtonPressed();
- // }
- // });
- // newProjectButton.setEnabled(true);
- synchHelper.synchCombo(componentCombo, IJ2EEComponentImportDataModelProperties.COMPONENT_NAME, new Control[]{componentLabel});
- new Label(parent, SWT.NULL);
- createServerTargetComposite(parent);
- //}
- }
-
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- Combo serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- serverTargetCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Button newServerTargetButton = new Button(parent, SWT.NONE);
- newServerTargetButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E));
- newServerTargetButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- newServerTargetButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- FlexibleProjectCreationWizardPage.launchNewRuntimeWizard(getShell(), model);
- }
- });
- Control[] deps = new Control[]{label, newServerTargetButton};
- synchHelper.synchCombo(serverTargetCombo, IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID, deps);
- if (serverTargetCombo.getVisibleItemCount() != 0)
- serverTargetCombo.select(0);
- }
-
- /**
- *
- */
- // protected void handleNewProjectButtonPressed() {
- // J2EEComponentCreationDataModel dm = getNewProjectCreationDataModel();
- //
- // WizardDialog dialog = new WizardDialog(projectCombo.getShell(), getNewProjectWizard(dm));
- // dialog.create();
- // dialog.getShell().setSize(500, 500);
- // if (dialog.open() == Window.OK) {
- // model.notifyValidValuesChange(J2EEArtifactImportDataModel.PROJECT_NAME);
- // String projectName = dm.getStringProperty(EditModelOperationDataModel.PROJECT_NAME);
- // model.setProperty(J2EEArtifactImportDataModel.PROJECT_NAME, projectName);
- // model.setBooleanProperty(J2EEArtifactImportDataModel.OVERWRITE_PROJECT, true);
- // }
- // }
- // protected J2EEComponentCreationDataModel getNewProjectCreationDataModel() {
- // return null;
- // }
- //
- // protected WTPWizard getNewProjectWizard(J2EEComponentCreationDataModel aModel) {
- // return null;
- // }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
- */
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
- /**
- * @return
- */
- protected String getProjectImportLabel() {
- return null;
- }
-
- /**
- * @param composite
- */
- protected void createFileNameComposite(Composite parent) {
- Label fileLabel = new Label(parent, SWT.NONE);
- fileLabel.setText(getFileImportLabel());
-
- // setup combo
- fileNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- fileNameCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
- // setup browse button
- Button browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleFileBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
-
- synchHelper.synchCombo(fileNameCombo, IJ2EEComponentImportDataModelProperties.FILE_NAME, new Control[]{fileLabel, browseButton});
- }
-
- /**
- *
- */
- protected void handleFileBrowseButtonPressed() {
-
- FileDialog dialog = new FileDialog(fileNameCombo.getShell());
- dialog.setFilterExtensions(getFilterExpression());
- String filename = dialog.open();
- if (filename != null)
- model.setProperty(IJ2EEComponentImportDataModelProperties.FILE_NAME, filename);
- }
-
- /**
- * @return
- */
- protected String[] getFilterExpression() {
- return new String[0];
- }
-
- protected void restoreWidgetValues() {
-
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null)
- return; // ie.- no settings stored
- for (int i = 0; i < sourceNames.length; i++) {
- if (sourceNames[i] == null)
- sourceNames[i] = ""; //$NON-NLS-1$
- }
- fileNameCombo.setItems(sourceNames);
- }
- }
-
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- // update source names history
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null) {
- sourceNames = new String[0];
- }
- // rip out any empty filenames and trim length to 5
- ArrayList newNames = new ArrayList();
- for (int i = 0; i < sourceNames.length && i < 5; i++) {
- if (sourceNames[i].trim().length() > 0) {
- newNames.add(sourceNames[i]);
- }
- }
- String text = fileNameCombo.getText();
- newNames.remove(text);
- newNames.add(0, text);
- sourceNames = new String[newNames.size()];
- newNames.toArray(sourceNames);
-
- // sourceNames = addToHistory(sourceNames,
- // getJ2EEImportDataModel().getStringProperty(J2EEImportDataModel.FILE_NAME));
- settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
- }
- }
-
- /**
- * @return
- */
- protected String getFileNamesStoreID() {
- return null;
- }
-
- /**
- * Must override
- */
- protected String getFileImportLabel() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
- */
- protected void enter() {
- super.enter();
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java
deleted file mode 100644
index ea4b4bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java
+++ /dev/null
@@ -1,49 +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
- *******************************************************************************/
-/*
- * Created on Dec 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEModuleExportPage extends J2EEExportPage {
- /**
- * @param model
- * @param pageName
- */
- public J2EEModuleExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING};
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java
deleted file mode 100644
index d105659..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java
+++ /dev/null
@@ -1,45 +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.jst.j2ee.internal.wizard;
-
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;
-
-public abstract class J2EEModuleFacetInstallPage extends DataModelFacetInstallPage implements IJ2EEModuleFacetInstallDataModelProperties {
-
- public J2EEModuleFacetInstallPage(String pageName) {
- super(pageName);
- }
-
- protected EarSelectionPanel earPanel;
-
- public void dispose() {
- if (null != earPanel) {
- earPanel.dispose();
- }
- super.dispose();
- }
-
- protected void setupEarControl(final Composite parent) {
- Composite c = new Composite(parent, SWT.NONE);
- c.setLayoutData(gdhfill());
- final GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- c.setLayout(layout);
- this.earPanel = new EarSelectionPanel(model, c);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java
deleted file mode 100644
index 497b35e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java
+++ /dev/null
@@ -1,66 +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
- *******************************************************************************/
-/*
- * Created on Dec 4, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEModuleImportPage extends J2EEImportPage {
- /**
- * @param model
- * @param pageName
- */
- public J2EEModuleImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
- createServerEarAndStandaloneGroup(composite);
- createAnnotationsStandaloneGroup(composite);
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- }
-
- /**
- * @param composite
- */
- private void createServerEarAndStandaloneGroup(Composite composite) {
- new ServerEarAndStandaloneGroup(composite, getDataModel().getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION), synchHelper);
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentImportDataModelProperties.FILE_NAME, IJ2EEComponentImportDataModelProperties.PROJECT_NAME, IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID, IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME, IJ2EEModuleImportDataModelProperties.ADD_TO_EAR};
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java
deleted file mode 100644
index a66992d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java
+++ /dev/null
@@ -1,234 +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.jst.j2ee.internal.wizard;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.internal.WorkbenchMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/*
- * Created on Nov 13, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and
- * Comments
- */
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class J2EEModulesDependencyPage extends DataModelWizardPage implements IJ2EEComponentCreationDataModelProperties{
-
- private CheckboxTableViewer availableJarsViewer;
-
- public J2EEModulesDependencyPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_DESC));
- }
-
- protected void enter() {
- super.enter();
- updateJarViewer();
- }
-
-
- private void updateJarViewer() {
- ClassPathSelection classPathSelection = (ClassPathSelection)getDataModel().getProperty(CLASSPATH_SELECTION);
-
- if (availableJarsViewer.getInput() != classPathSelection) {
- availableJarsViewer.setInput(classPathSelection);
- }
- }
-
- protected String[] getValidationPropertyNames() {
- return null;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout(2, false);
- composite.setLayout(layout);
- setInfopopID(IJ2EEUIContextIds.NEW_EJB_WIZARD_P3);
- Label projectLabel = new Label(composite, SWT.NONE);
- projectLabel.setText(WorkbenchMessages.NewProject_title); //$NON-NLS-1$
- Text projectText = new Text(composite, SWT.BORDER | SWT.READ_ONLY);
- synchHelper.synchText(projectText, PROJECT_NAME, null);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- projectText.setLayoutData(gd);
-
- Label earLabel = new Label(composite, SWT.NONE);
- earLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_PROJECT_FOR_MODULE_CREATION));
- Text earText = new Text(composite, SWT.BORDER | SWT.READ_ONLY);
- synchHelper.synchText(earText, EAR_COMPONENT_NAME, null);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- earText.setLayoutData(gd);
-
- Label spacerLabel = new Label(composite, SWT.NONE);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- spacerLabel.setLayoutData(gd);
-
- Label jarsLabel = new Label(composite, SWT.NONE);
- jarsLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_AVAILABLE_JARS));
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- jarsLabel.setLayoutData(gd);
-
- Composite tableComposite = new Composite(composite, SWT.NONE);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 2;
- gd.horizontalIndent = 0;
- gd.heightHint = 60;
- gd.widthHint = 200;
- tableComposite.setLayoutData(gd);
- GridLayout tableLayout = new GridLayout();
- tableLayout.marginWidth = 0;
- tableComposite.setLayout(tableLayout);
- createAvailableJarsList(tableComposite);
-
- spacerLabel = new Label(composite, SWT.NONE);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- spacerLabel.setLayoutData(gd);
-
- Label classpathLabel = new Label(composite, SWT.NONE);
- classpathLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_CLASSPATH));
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- classpathLabel.setLayoutData(gd);
-
- Text classpathText = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.READ_ONLY);
- //TODO synchhelper work with flexible project
- //synchHelper.synchText(classpathText, FlexibleJ2EEModuleCreationDataModel.JAR_LIST_TEXT_UI, null);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- gd.heightHint = 30;
- classpathText.setLayoutData(gd);
-
- return composite;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJarsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.CHECK | SWT.FULL_SELECTION | SWT.BORDER);
- addResizeListenerToTable();
- AvailableJarsProvider provider = new AvailableJarsProvider();
- availableJarsViewer.setContentProvider(provider);
- availableJarsViewer.setLabelProvider(provider);
- availableJarsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- Table table = availableJarsViewer.getTable();
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- table.setLayout(tableLayout);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- availableJarsViewer.setSorter(null);
- GridData gd = new GridData(GridData.FILL_BOTH);
- table.setLayoutData(gd);
-
- // table columns
- TableColumn fileNameColumn = new TableColumn(table, SWT.NONE);
- fileNameColumn.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_MODULE));
- fileNameColumn.setResizable(true);
-
- TableColumn projectColumn = new TableColumn(table, SWT.NONE);
- projectColumn.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT));
- projectColumn.setResizable(true);
-
- updateJarViewer();
- }
-
- public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- ClasspathElement element = (ClasspathElement) event.getElement();
- element.setSelected(event.getChecked());
- String classEntry = element.getText();
- IDataModel updateManifest = (IDataModel) model.getProperty(NESTED_UPDATE_MANIFEST_DM);
- List classpathList = (List) updateManifest.getProperty(UpdateManifestDataModelProperties.JAR_LIST);
- if (event.getChecked()) {
- if (!classpathList.contains(classEntry)) {
- classpathList.add(classEntry);
- }
- } else if (classpathList.contains(classEntry)) {
- classpathList.remove(classEntry);
- }
- updateManifest.setProperty(UpdateManifestDataModelProperties.JAR_LIST, classpathList);
-// updateManifest.propertyChanged(new WTPOperationDataModelEvent(updateManifest, UpdateManifestDataModel.JAR_LIST, WTPOperationDataModelEvent.PROPERTY_CHG));
- }
-
- protected void addResizeListenerToTable() {
- Table aTable = availableJarsViewer.getTable();
- aTable.addControlListener(new ControlAdapter() {
- boolean fResized = false;
-
- public void controlResized(ControlEvent e) {
- if (e.widget instanceof Table && !fResized) {
- final Table table = (Table) e.widget;
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- if (table.isDisposed() || fResized)
- return;
- Point size = table.getSize();
- if (size.x > 4) {
- setResized(table);
- int newSize = size.x / 2 - 2;
- TableColumn column = table.getColumn(0);
- if (column != null && !column.isDisposed())
- column.setWidth(newSize);
- column = table.getColumn(1);
- if (column != null && !column.isDisposed())
- column.setWidth(newSize);
- }
- }
- });
- }
- }
-
- public void setResized(Table table) {
- fResized = true;
- table.removeControlListener(this);
- }
- });
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
deleted file mode 100644
index ba3c0bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
+++ /dev/null
@@ -1,398 +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
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author mdelder
- */
-public class J2EEUtilityJarImportPageNew extends J2EEImportPage {
-
- private static final String STORE_LABEL = "J2EE_UTILITY_JAR_LIST_IMPORT_"; //$NON-NLS-1$
- // private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-
- private Button deselectAllButton;
-
- private Button selectAllButton;
-
- protected Button browseButton;
-
- protected Button useAlternateRootBtn;
-
- private Button overwriteProjectCheckbox;
-
- protected CheckboxTableViewer availableJARsViewer;
-
- protected boolean utilJarSelectionChanged = false;
-
- private Combo availableJarsCombo;
-
- protected Button linkedPathCheckbox;
-
- /**
- * @param model
- * @param pageName
- */
- public J2EEUtilityJarImportPageNew(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_0")); //$NON-NLS-1$
- setDescription(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_1")); //$NON-NLS-1$
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.IMPORT_UTILITY_JAR_WIZARD_P1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createUtilityJarFileNameComposite(composite);
- createLinkedPathVariable(composite);
- createJARsComposite(composite);
- /* createOverwriteCheckbox(composite); */
-
- restoreWidgetValues();
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createUtilityJarFileNameComposite(Composite parent) {
- Group fileNameGroup = new Group(parent, SWT.NULL);
- fileNameGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_2")); //$NON-NLS-1$
- GridLayout layout = new GridLayout(3, false);
- fileNameGroup.setLayout(layout);
- fileNameGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label fileLabel = new Label(fileNameGroup, SWT.NONE);
- fileLabel.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_3")); //$NON-NLS-1$
- fileLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- // setup combo
- availableJarsCombo = new Combo(fileNameGroup, SWT.SINGLE | SWT.BORDER);
- availableJarsCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
- // setup browse button
- browseButton = new Button(fileNameGroup, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.HORIZONTAL_ALIGN_END)));
- browseButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- handleBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
-
- synchHelper.synchCombo(availableJarsCombo, IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY, new Control[]{fileLabel, browseButton});
- }
-
- protected void createLinkedPathVariable(Composite parent) {
-
-
- Group linkedPathGroup = new Group(parent, SWT.NULL);
- linkedPathGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_4")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(1, true);
- linkedPathGroup.setLayout(layout);
- linkedPathGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite checkboxGroup = new Composite(linkedPathGroup, SWT.NULL);
- GridLayout checkboxLayout = new GridLayout(2, false);
- checkboxGroup.setLayout(checkboxLayout);
- checkboxGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- linkedPathCheckbox = new Button(checkboxGroup, SWT.CHECK);
- linkedPathCheckbox.setText(" "); //$NON-NLS-1$
- Text linkedPathText = new Text(checkboxGroup, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
- linkedPathText.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_5")); //$NON-NLS-1$
- GridData textGridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- textGridData.heightHint = 50;
- textGridData.widthHint = 350;
- linkedPathText.setLayoutData(textGridData);
- linkedPathText.setBackground(checkboxGroup.getBackground());
-
- // setup combo
- Combo availableLinkedPathsCombo = new Combo(linkedPathGroup, SWT.SINGLE | SWT.BORDER);
- availableLinkedPathsCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
- synchHelper.synchCombo(availableLinkedPathsCombo, IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE, new Control[]{availableLinkedPathsCombo});
-
- synchHelper.synchCheckbox(linkedPathCheckbox, IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE, new Control[]{availableLinkedPathsCombo});
-
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
- dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
- String dirName = getBrowseStartLocation();
-
- if (!isNullOrEmpty(dirName)) {
- File path = new File(dirName);
- if (path.exists())
- dialog.setFilterPath(dirName);
- }
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- availableJarsCombo.setText(selectedDirectory);
- }
-
- /**
- * @return
- */
- protected String getBrowseStartLocation() {
- if (availableJarsCombo.getText() != null && availableJarsCombo.getText().length() > 0)
- return availableJarsCombo.getText();
- return null;
- }
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
-
- utilJarSelectionChanged = true;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
- GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gData.widthHint = 200;
- gData.heightHint = 80;
- availableJARsViewer.getControl().setLayoutData(gData);
- AvailableUtilityJarsProvider availableUtilJARsProvider = new AvailableUtilityJarsProvider();
- availableJARsViewer.setContentProvider(availableUtilJARsProvider);
- availableJARsViewer.setLabelProvider(availableUtilJARsProvider);
-
- availableJARsViewer.getTable().setHeaderVisible(false);
- availableJARsViewer.getTable().setLinesVisible(false);
-
- availableJARsViewer.setInput(model);
-
- /* getModel().addListener(getOperationDataModelListener()); */
- synchHelper.synchCheckBoxTableViewer(availableJARsViewer, IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, null);
-
-
- model.addListener(new IDataModelListener() {
-
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY.equals(event.getPropertyName()))
- availableJARsViewer.setInput(model);
- }
- });
- }
-
- private void handleDeselectAllButtonPressed() {
- model.setProperty(IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, new Object[0]);
- }
-
- private void handleSelectAllButtonPressed() {
- Object[] selection = new Object[availableJARsViewer.getTable().getItemCount()];
- for (int i = 0; i < selection.length; i++) {
- selection[i] = availableJARsViewer.getElementAt(i);
- }
- model.setProperty(IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, selection);
- }
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON)); //$NON-NLS-1$ = "Select All"
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = 22;
- gd.widthHint = 120;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- handleSelectAllButtonPressed();
- }
- });
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON)); //$NON-NLS-1$ = "Deselect All"
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- gd.heightHint = 22;
- gd.widthHint = 120;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- handleDeselectAllButtonPressed();
- }
- });
- }
-
- public void createNestedProjectOverwriteCheckbox(Composite parent) {
- Button allowNestedOverwriteCheckbox;
- allowNestedOverwriteCheckbox = new Button(parent, SWT.CHECK);
- allowNestedOverwriteCheckbox.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_OVERWRITE_NESTED));
- synchHelper.synchCheckbox(allowNestedOverwriteCheckbox, IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY, null);
- }
-
- protected void createJARsComposite(Composite parent) {
- Group group = new Group(parent, SWT.NULL);
- group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_JARS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- group.setLayout(layout);
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label description = new Label(group, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_UTILITY_JAR_LISTEAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 2;
- description.setLayoutData(gd2);
-
- // create jars check box viewer
- createAvailableJarsList(group);
- createButtonsGroup(group);
- }
-
- /**
- * @param projectOptionsGroup
- */
- protected void createOverwriteCheckbox(Composite parent) {
-
- overwriteProjectCheckbox = new Button(parent, SWT.CHECK);
- overwriteProjectCheckbox.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_6")); //$NON-NLS-1$
- synchHelper.synchCheckbox(overwriteProjectCheckbox, IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY, null);
- }
-
- protected void setJARsCompositeEnabled(boolean enabled) {
- availableJARsViewer.getTable().setEnabled(enabled);
- availableJARsViewer.setAllChecked(false);
- availableJARsViewer.setAllGrayed(!enabled);
- selectAllButton.setEnabled(enabled);
- deselectAllButton.setEnabled(enabled);
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY, IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE};
- }
-
- protected void restoreWidgetValues() {
-
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null)
- return; // ie.- no settings stored
- for (int i = 0; i < sourceNames.length; i++) {
- if (sourceNames[i] == null)
- sourceNames[i] = ""; //$NON-NLS-1$
- }
- availableJarsCombo.setItems(sourceNames);
- }
- }
-
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- // update source names history
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null) {
- sourceNames = new String[0];
- }
-
- String newName = availableJarsCombo.getText();
-
- // rip out any empty filenames and trim length to 5
- ArrayList newNames = new ArrayList();
- for (int i = 0; i < sourceNames.length && i < 5; i++) {
- if (sourceNames[i].trim().length() > 0 && !newName.equals(sourceNames[i])) {
- newNames.add(sourceNames[i]);
- }
- }
- newNames.add(0, availableJarsCombo.getText());
- sourceNames = new String[newNames.size()];
- newNames.toArray(sourceNames);
-
- settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileNamesStoreID()
- */
- protected String getFileNamesStoreID() {
- return "UTIL";//$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
- */
- protected String getFileImportLabel() {
- return J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_7"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java
deleted file mode 100644
index 831a04d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java
+++ /dev/null
@@ -1,417 +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
- *******************************************************************************/
-/*
- * Created on May 13, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class J2EEUtilityJarImportTypePageNew extends DataModelWizardPage {
-
- protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL); //$NON-NLS-1$
-
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-
- protected IStructuredSelection currentResourceSelection;
-
- private Combo resourceNameCombo;
-
- private Button copyJarIntoEAR;
-
- private Button linkJarIntoEAR;
-
- private Button createLinkedProjects;
-
- private Button createProjects;
-
- protected Button browseButton;
-
- private Button binaryImportCheckbox;
-
- private Button overrideProjectRootCheckbox;
-
-
- protected Text projectRootLocationText;
-
- private Label moduleProjectLocationLabel;
-
- protected boolean synching;
-
- public static final String TITLE = J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_0"); //$NON-NLS-1$
- public static final String DESCRIPTION = J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_1"); //$NON-NLS-1$
-
- private Group projectRootComposite;
-
-
- /**
- * @param model
- * @param pageName
- * @param title
- * @param titleImage
- */
- public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName, String title, ImageDescriptor titleImage) {
- super(model, pageName, title, titleImage);
- setTitle(""); //$NON-NLS-1$
- setDescription(""); //$NON-NLS-1$
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.IMPORT_UTILITY_JAR_WIZARD_P2);
- }
-
- public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName);
- this.currentResourceSelection = selection;
- setTitle(TITLE);
- setDescription(DESCRIPTION);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(TITLE);
- setDescription(DESCRIPTION);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT, IJ2EEUtilityJarListImportDataModelProperties.PROJECT_ROOT};
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(1, false);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createEARProjectGroup(composite);
- createUtilityJarImportTypes(composite);
- createProjectCreationOptions(composite);
-
- setupBasedOnInitialSelections();
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createUtilityJarImportTypes(Composite parent) {
- Group typesGroup = new Group(parent, SWT.NULL);
- typesGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_2")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(1, false);
- typesGroup.setLayout(layout);
- typesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createProjects = new Button(typesGroup, SWT.RADIO);
- createProjects.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_3")); //$NON-NLS-1$
- synchHelper.synchRadio(createProjects, IJ2EEUtilityJarListImportDataModelProperties.CREATE_PROJECT, null);
-
- createLinkedProjects = new Button(typesGroup, SWT.RADIO);
- createLinkedProjects.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_4")); //$NON-NLS-1$
- synchHelper.synchRadio(createLinkedProjects, IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PROJECT, null);
-
- copyJarIntoEAR = new Button(typesGroup, SWT.RADIO);
- copyJarIntoEAR.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_5")); //$NON-NLS-1$
- synchHelper.synchRadio(copyJarIntoEAR, IJ2EEUtilityJarListImportDataModelProperties.COPY, null);
-
- linkJarIntoEAR = new Button(typesGroup, SWT.RADIO);
- linkJarIntoEAR.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_6")); //$NON-NLS-1$
- /* linkJarIntoEAR.addSelectionListener(getTypeSelectionListener()); */
- synchHelper.synchRadio(linkJarIntoEAR, IJ2EEUtilityJarListImportDataModelProperties.LINK_IMPORT, null);
-
- }
-
- protected void createProjectCreationOptions(Composite parent) {
-
- Group projectOptionsGroup = new Group(parent, SWT.NULL);
- projectOptionsGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_7")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(1, false);
- projectOptionsGroup.setLayout(layout);
- projectOptionsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createBinaryImportCheckbox(projectOptionsGroup);
-
- overrideProjectRootCheckbox = new Button(projectOptionsGroup, SWT.CHECK);
- overrideProjectRootCheckbox.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_11")); //$NON-NLS-1$
- createProjectRootComposite(projectOptionsGroup);
-
- synchHelper.synchCheckbox(overrideProjectRootCheckbox, IJ2EEUtilityJarListImportDataModelProperties.OVERRIDE_PROJECT_ROOT, new Control[]{/*
- * moduleProjectLocationLabel,
- * projectRootLocationText,
- * browseButton
- */});
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#propertyChanged(org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModelEvent)
- */
- public void propertyChanged(DataModelEvent event) {
- // if (synching) return;
- // synching = true;
- // if (J2EEUtilityJarListImportDataModel.CREATE_PROJECT.equals(event.getPropertyName())
- // || J2EEUtilityJarListImportDataModel.LINK_IMPORT.equals(event.getPropertyName())) {
- //
- // boolean shouldCreateProject =
- // getModel().getBooleanProperty(J2EEUtilityJarListImportDataModel.CREATE_PROJECT);
- // boolean linkImportedContent =
- // getModel().getBooleanProperty(J2EEUtilityJarListImportDataModel.LINK_IMPORT);
- //
- // createProjects.setSelection(shouldCreateProject && !linkImportedContent);
- // createLinkedProjects.setSelection(shouldCreateProject && linkImportedContent);
- // linkJarIntoEAR.setSelection(!shouldCreateProject && linkImportedContent);
- // copyJarIntoEAR.setSelection(!shouldCreateProject && !linkImportedContent);
- //
- // enableProjectOptions(shouldCreateProject);
- //
- // } else
- // if(J2EEUtilityJarListImportDataModel.OVERRIDE_PROJECT_ROOT.equals(event.getPropertyName()))
- // {
- // boolean overrideProjectRoot =
- // getModel().getBooleanProperty(J2EEUtilityJarListImportDataModel.OVERRIDE_PROJECT_ROOT);
- // projectRootLocationText.setEnabled(overrideProjectRoot);
- // }
- // synching = false;
- super.propertyChanged(event);
- }
-
- /**
- *
- * @param parent
- * a <code>Composite</code> that is to be used as the parent of this group's
- * collection of visual components
- * @see org.eclipse.swt.widgets.Composite
- */
- protected void createEARProjectGroup(Composite parent) {
-
- Group earGroup = new Group(parent, SWT.NULL);
- earGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_8")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(2, false);
- earGroup.setLayout(layout);
- earGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- // Project label
- Label projectLabel = new Label(earGroup, SWT.NONE);
- projectLabel.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_9")); //$NON-NLS-1$
- // Project combo
- resourceNameCombo = new Combo(earGroup, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- resourceNameCombo.setLayoutData(data);
- synchHelper.synchCombo(resourceNameCombo, IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT, null);
-
- }
-
- protected void createProjectRootComposite(Composite parent) {
- projectRootComposite = new Group(parent, SWT.NULL);
- projectRootComposite.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOCATIONS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- projectRootComposite.setLayout(layout);
- projectRootComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label description = new Label(projectRootComposite, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_PROJECT_GROUP_DESCRIPTION));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 3;
- description.setLayoutData(gd2);
-
- moduleProjectLocationLabel = new Label(projectRootComposite, SWT.NULL);
- moduleProjectLocationLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.USE_DEFAULT_ROOT_RADIO));
- moduleProjectLocationLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- projectRootLocationText = new Text(projectRootComposite, SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- projectRootLocationText.setLayoutData(gd);
- projectRootLocationText.setText(ResourcesPlugin.getWorkspace().getRoot().getFullPath().toOSString());
- projectRootLocationText.setEnabled(false); /* disabled by default */
-
- browseButton = new Button(projectRootComposite, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
- browseButton.setLayoutData(gd);
- browseButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- handleRootProjectBrowseButtonPressed();
- }
- });
-
- synchHelper.synchText(projectRootLocationText, IJ2EEUtilityJarListImportDataModelProperties.PROJECT_ROOT, new Control[]{moduleProjectLocationLabel, projectRootLocationText, browseButton});
- }
-
- protected void createBinaryImportCheckbox(Composite parent) {
- binaryImportCheckbox = new Button(parent, SWT.CHECK);
- binaryImportCheckbox.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_10")); //$NON-NLS-1$
- synchHelper.synchCheckbox(binaryImportCheckbox, IJ2EEUtilityJarListImportDataModelProperties.BINARY_IMPORT, null);
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleRootProjectBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
- dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
- String dirName = getBrowseStartLocation();
-
- if (!isNullOrEmpty(dirName)) {
- File path = new File(dirName);
- if (path.exists())
- dialog.setFilterPath(dirName);
- }
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- projectRootLocationText.setText(selectedDirectory);
-
- }
-
- protected String getBrowseStartLocation() {
- String text = projectRootLocationText.getText();
- return text;
- }
-
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected void setupBasedOnInitialSelections() {
-
- if (null == currentResourceSelection || currentResourceSelection.isEmpty() || setupBasedOnRefObjectSelection())
- return; // no
- // setup
- // needed
-
- java.util.List selections = new ArrayList();
- Iterator aenum = currentResourceSelection.iterator();
- while (aenum.hasNext()) {
- IResource currentResource = (IResource) aenum.next();
- // do not add inaccessible elements
- if (currentResource.isAccessible())
- selections.add(currentResource);
- }
- if (selections.isEmpty())
- return; // setup not needed anymore
-
- int selectedResourceCount = selections.size();
- if (selectedResourceCount == 1) {
- IResource resource = (IResource) selections.get(0);
- if (resource instanceof IProject ) {
- resourceNameCombo.setText(resource.getName().toString());
- }
- }
- }
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected boolean setupBasedOnRefObjectSelection() {
-
- if (currentResourceSelection.size() != 1)
- return false;
-
- Object o = currentResourceSelection.getFirstElement();
- if (!isMetaTypeSupported(o))
- return false;
-
- EObject ref = (EObject) o;
- IResource resource = ProjectUtilities.getProject(ref);
- if (resource != null)
- resourceNameCombo.setText(resource.getName().toString());
- return true;
- }
-
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof EARFile || o instanceof Application;
- }
-
- protected void enableProjectOptions(boolean enabled) {
- // getModel().setBooleanProperty(J2EEUtilityJarListImportDataModel.BINARY_IMPORT, enabled);
- binaryImportCheckbox.setEnabled(enabled);
- overrideProjectRootCheckbox.setEnabled(enabled);
-
- if (overrideProjectRootCheckbox.getSelection() && enabled)
- projectRootLocationText.setEnabled(true);
- else
- projectRootLocationText.setEnabled(false);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
- */
- public boolean isPageComplete() {
- return model.validateProperty(IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT).isOK();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java
deleted file mode 100644
index 67a123d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java
+++ /dev/null
@@ -1,88 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-
-/**
- * <p>
- * Used to import Utility Jars into several Eclipse workbench configurations. These can be extracted
- * as editable projects, binary projects, linked resources in the EAR module or actual resources in
- * the EAR module.
- * </p>
- */
-public final class J2EEUtilityJarImportWizardNew extends J2EEArtifactImportWizard implements IImportWizard {
-
- /**
- * <p>
- * Constant used to identify the key of the page of the Wizard which allows users to define the
- * type of import they would like to carry out.
- * </p>
- */
- private static final String IMPORT_TYPE = "IMPORT_TYPE"; //$NON-NLS-1$
-
- /**
- * <p>
- * Constant used to identify the key of the page of the Wizard that allows users to select jar
- * files for import
- * </p>
- */
- private static final String SELECT_JARS = "SELECT_JARS"; //$NON-NLS-1$
-
- private IStructuredSelection selection;
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEUtilityJarImportWizardNew() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEUtilityJarImportWizardNew(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link J2EEUtilityJarImportTypePageNew}as the main wizard page ({@link #IMPORT_TYPE})
- * <li>{@link J2EEUtilityJarImportPageNew}as the main wizard page ({@link #SELECT_JARS})
- * </ul>
- * </p>
- */
- public void doAddPages() {
- this.addPage(new J2EEUtilityJarImportTypePageNew(getDataModel(), IMPORT_TYPE, selection));
- this.addPage(new J2EEUtilityJarImportPageNew(getDataModel(), SELECT_JARS));
- }
-
- protected IDataModelProvider getDefaultProvider() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/MinimizedFileSystemElement.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/MinimizedFileSystemElement.java
deleted file mode 100644
index eb878c0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/MinimizedFileSystemElement.java
+++ /dev/null
@@ -1,131 +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.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ui.dialogs.FileSystemElement;
-import org.eclipse.ui.model.AdaptableList;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-
-/**
- * The <code>MinimizedFileSystemElement</code> is a <code>FileSystemElement</code> that knows if
- * it has been populated or not.
- */
-class MinimizedFileSystemElement extends FileSystemElement {
- private boolean populated = false;
- private String packageBaseDirName = null;
-
-
- /**
- * Create a <code>MinimizedFileSystemElement</code> with the supplied name and parent.
- *
- * @param name
- * the name of the file element this represents
- * @param parent
- * the containing parent
- * @param isDirectory
- * indicated if this could have children or not
- */
- MinimizedFileSystemElement(String name, org.eclipse.ui.dialogs.FileSystemElement parent, boolean isDirectory) {
- super(name, parent, isDirectory);
- }
-
- public void setPackageBaseDirName(String s) {
- packageBaseDirName = s;
- }
-
- public void addChild(FileSystemElement child) {
- if (child.isDirectory()) {
- super.addChild(child);
- } else {
- if (child.getFileNameExtension().equals("class")) { //$NON-NLS-1$
- super.addChild(child);
- }
- }
- }
-
- /**
- * Returns a list of the files that are immediate children. Use the supplied provider if it
- * needs to be populated. of this folder.
- */
- public AdaptableList getFiles(IImportStructureProvider provider) {
- if (!populated)
- populate(provider);
-
- return super.getFiles();
-
- }
-
- /**
- * Returns a list of the folders that are immediate children. Use the supplied provider if it
- * needs to be populated. of this folder.
- */
- public AdaptableList getFolders(IImportStructureProvider provider) {
- if (!populated)
- populate(provider);
-
- return super.getFolders();
-
- }
-
- /**
- * Return whether or not population has happened for the receiver.
- */
- boolean isPopulated() {
- return this.populated;
- }
-
- /**
- * Return whether or not population has not happened for the receiver.
- */
- boolean notPopulated() {
- return !this.populated;
- }
-
- /**
- * Populate the files and folders of the receiver using the suppliec structure provider.
- *
- * @param provider
- * org.eclipse.ui.wizards.datatransfer.IImportStructureProvider
- */
- private void populate(IImportStructureProvider provider) {
-
- Object fileSystemObject = getFileSystemObject();
-
- List children = provider.getChildren(fileSystemObject);
- if (children == null)
- children = new ArrayList(1);
- Iterator childrenEnum = children.iterator();
- while (childrenEnum.hasNext()) {
- Object child = childrenEnum.next();
-
- String elementLabel = provider.getLabel(child);
- if (elementLabel.equals(packageBaseDirName) || packageBaseDirName == null) {
- //Create one level below
-
- MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, this, provider.isFolder(child));
- result.setFileSystemObject(child);
- }
- }
- setPopulated();
-
- }
-
- /**
- * Set whether or not population has happened for the receiver to true.
- */
- void setPopulated() {
- this.populated = true;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewFlexibleProjectGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewFlexibleProjectGroup.java
deleted file mode 100644
index 23bbd1f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewFlexibleProjectGroup.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 14, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-public class NewFlexibleProjectGroup implements IFlexibleJavaProjectCreationDataModelProperties{
- private IDataModel model;
- public Text projectNameField = null;
- protected Text locationPathField = null;
- protected Button browseButton = null;
- // constants
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- // default values
- private String defProjectNameLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL); //$NON-NLS-1$
- private String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL); //$NON-NLS-1$
- private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
- private DataModelSynchHelper synchHelper;
-
- /**
- * @param parent
- * @param style
- */
- public NewFlexibleProjectGroup(Composite parent, int style, IDataModel model, DataModelSynchHelper aHelper) {
- this.model = model;
- synchHelper = aHelper;
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createProjectNameGroup(parent);
- createProjectLocationGroup(parent);
- projectNameField.setFocus();
- }
-
- /**
- *
- */
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(defProjectNameLabel);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameField = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- projectNameField.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(projectNameField, PROJECT_NAME, new Control[]{projectNameLabel});
- }
-
- /**
- *
- */
- private void createProjectLocationGroup(Composite parent) {
- // set up location path label
- Label locationPathLabel = new Label(parent, SWT.NONE);
- locationPathLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOC_LBL));
- GridData data = new GridData();
- locationPathLabel.setLayoutData(data);
- // set up location path entry field
- locationPathField = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- locationPathField.setLayoutData(data);
- // set up browse button
- browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleLocationBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
- synchHelper.synchText(locationPathField, PROJECT_LOCATION, null);
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleLocationBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
- dialog.setMessage(defDirDialogLabel);
- String dirName = model.getStringProperty(PROJECT_LOCATION);
- if ((dirName != null) && (dirName.length() != 0)) {
- File path = new File(dirName);
- if (path.exists()) {
- dialog.setFilterPath(dirName);
- }
- }
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- model.setProperty(PROJECT_LOCATION, selectedDirectory);
- }
- }
-
- public void dispose() {
- model.removeListener(synchHelper);
- model = null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
deleted file mode 100644
index 1d8da97..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 23, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.wizards.IWizardDescriptor;
-import org.eclipse.ui.wizards.IWizardRegistry;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-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.frameworks.internal.ui.GenericWizardNode;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-
-public class NewJ2EEComponentSelectionPage extends DataModelWizardPage implements IDefaultJ2EEComponentCreationDataModelProperties {
- private Button defaultModulesButton;
-
- private Composite defaultModulesComposite;
-
- private Composite newModulesComposite;
-
- private Button appClientRadioButton;
-
- private Button ejbRadioButton;
-
- private Button webRadioButton;
-
- private Button connectorRadioButton;
-
- private GenericWizardNode appClientNode;
-
- private GenericWizardNode ejbNode;
-
- private GenericWizardNode webNode;
-
- private GenericWizardNode connectorNode;
-
- private GenericWizardNode selectedNode;
-
- private StackLayout stackLayout;
-
- /**
- * @param model
- * @param pageName
- */
- protected NewJ2EEComponentSelectionPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_DESC));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[] { CREATE_APPCLIENT, APPCLIENT_COMPONENT_NAME, CREATE_CONNECTOR, CONNECTOR_COMPONENT_NAME, CREATE_EJB, EJB_COMPONENT_NAME, CREATE_WEB, WEB_COMPONENT_NAME, MODULE_NAME_COLLISIONS_VALIDATION, ENABLED };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- setInfopopID(IJ2EEUIContextIds.EAR_NEW_MODULE_PROJECTS_PAGE);
- createDefaultCheckBox(composite);
- Composite forStackComposite = new Composite(composite, SWT.NULL);
- layout = new GridLayout();
- forStackComposite.setLayout(layout);
- forStackComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
- Composite stackComposite = createStackLayoutComposite(forStackComposite);
- createDefaultModulesComposite(stackComposite);
- createModuleSelectionComposite(stackComposite);
- stackLayout.topControl = defaultModulesComposite;
- setButtonEnablement();
- return composite;
- }
-
- protected Composite createStackLayoutComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- stackLayout = new StackLayout();
- composite.setLayout(stackLayout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- return composite;
- }
-
- private void createDefaultModulesComposite(Composite parent) {
- defaultModulesComposite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- defaultModulesComposite.setLayout(layout);
- defaultModulesComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- // Default Module Controls creation
- createAppClientDefaultModuleControl();
- if (J2EEPlugin.isEJBSupportAvailable())
- createEJBDefaultModuleControl();
- createWebDefaultModuleControl();
- if (J2EEPlugin.isEJBSupportAvailable())
- createConnectorDefaultModuleControl();
- }
-
- /**
- * @param parent
- */
- private void createModuleSelectionComposite(Composite parent) {
- newModulesComposite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- newModulesComposite.setLayout(layout);
- newModulesComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- appClientRadioButton = new Button(newModulesComposite, SWT.RADIO);
-
- appClientRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.appClient")); //$NON-NLS-1$
- appClientRadioButton.addListener(SWT.Selection, this);
- if (EarModuleManager.getEJBModuleExtension() != null) {
- ejbRadioButton = new Button(newModulesComposite, SWT.RADIO);
- ejbRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.ejb")); //$NON-NLS-1$
- ejbRadioButton.addListener(SWT.Selection, this);
- }
- if (EarModuleManager.getWebModuleExtension() != null) {
- webRadioButton = new Button(newModulesComposite, SWT.RADIO);
- webRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.web")); //$NON-NLS-1$
- webRadioButton.addListener(SWT.Selection, this);
- }
- if (EarModuleManager.getJCAModuleExtension() != null) {
- connectorRadioButton = new Button(newModulesComposite, SWT.RADIO);
- connectorRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.jca")); //$NON-NLS-1$
- connectorRadioButton.addListener(SWT.Selection, this);
- }
- }
-
- /**
- *
- */
- private void createConnectorDefaultModuleControl() {
- if (EarModuleManager.getJCAModuleExtension() != null) {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_JCA_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_CONNECTOR, CONNECTOR_COMPONENT_NAME);
- }
- }
-
- /**
- *
- */
- private void createWebDefaultModuleControl() {
- if (EarModuleManager.getWebModuleExtension() != null) {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_WEB_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_WEB, WEB_COMPONENT_NAME);
- }
- }
-
- /**
- *
- */
- private void createEJBDefaultModuleControl() {
- if (EarModuleManager.getEJBModuleExtension() != null) {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_EJB_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_EJB, EJB_COMPONENT_NAME);
- }
- }
-
- private void createAppClientDefaultModuleControl() {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_APPCLIENT_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_APPCLIENT, APPCLIENT_COMPONENT_NAME);
- }
-
- private void createJ2EEComponentControl(String label, String createProperty, String projectProperty) {
- final Button checkBox = new Button(defaultModulesComposite, SWT.CHECK);
- checkBox.setSelection(true);
- checkBox.setText(label);
-
- final Text textField = new Text(defaultModulesComposite, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- textField.setLayoutData(data);
- synchHelper.synchCheckbox(checkBox, createProperty, null);
- synchHelper.synchText(textField, projectProperty, null);
- }
-
- private void createDefaultCheckBox(Composite composite) {
- Composite checkBoxComposite = new Composite(composite, SWT.NULL);
- GridLayout layout = new GridLayout();
- checkBoxComposite.setLayout(layout);
- checkBoxComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
- defaultModulesButton = new Button(checkBoxComposite, SWT.CHECK);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- data.horizontalIndent = 0;
- defaultModulesButton.setLayoutData(data);
- defaultModulesButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_NEW_MOD_SEL_PG_DEF_BTN));
- defaultModulesButton.setSelection(true);
- defaultModulesButton.addListener(SWT.Selection, this);
- synchHelper.synchCheckbox(defaultModulesButton, ENABLED, null);
- createControlsSeparatorLine(checkBoxComposite);
- }
-
- protected void createControlsSeparatorLine(Composite parent) {
- // add a horizontal line
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- separator.setLayoutData(data);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- public void handleEvent(Event evt) {
- if (evt.widget == defaultModulesButton)
- handleDefaultModulesButtonPressed();
- else if (!defaultModulesButton.getSelection()) {
- if (evt.widget == appClientRadioButton && appClientRadioButton.getSelection())
- setSelectedNode(getAppClientNode());
- else if (evt.widget == ejbRadioButton && ejbRadioButton.getSelection())
- setSelectedNode(getEjbNode());
- else if (evt.widget == webRadioButton && webRadioButton.getSelection())
- setSelectedNode(getWebNode());
- else if (evt.widget == connectorRadioButton && connectorRadioButton.getSelection())
- setSelectedNode(getConnectorNode());
- validatePage();
- }
- super.handleEvent(evt);
- }
-
- /**
- *
- */
- private void handleDefaultModulesButtonPressed() {
- if (defaultModulesButton.getSelection()) {
- setSelectedNode(null);
- showDefaultModulesComposite();
- setDefaultModulesSelection(true);
- } else {
- setDefaultModulesSelection(false);
- showNewModulesCompsite();
- }
- setButtonEnablement();
- validatePage();
- }
-
- private void setDefaultModulesSelection(boolean selection) {
- getDataModel().setBooleanProperty(CREATE_APPCLIENT, selection);
- getDataModel().setBooleanProperty(CREATE_CONNECTOR, selection);
- getDataModel().setBooleanProperty(CREATE_EJB, selection);
- getDataModel().setBooleanProperty(CREATE_WEB, selection);
- }
-
- private void showDefaultModulesComposite() {
- defaultModulesComposite.setVisible(true);
- newModulesComposite.setVisible(false);
- stackLayout.topControl = defaultModulesComposite;
- }
-
- /**
- * This is done based on the J2EE version. We need to disable Connectors if
- * not j2ee 1.3 or higher.
- */
- private void setButtonEnablement() {
- if (!defaultModulesButton.getSelection() && connectorRadioButton != null) {
- int version = getDataModel().getIntProperty(J2EE_VERSION);
- connectorRadioButton.setEnabled(version > J2EEVersionConstants.J2EE_1_2_ID);
- }
- }
-
- /**
- *
- */
- private void showNewModulesCompsite() {
- defaultModulesComposite.setVisible(false);
- newModulesComposite.setVisible(true);
- if (!isAnyModuleRadioSelected())
- appClientRadioButton.setSelection(true);
- setSelectedNode(getWizardNodeFromSelection());
- stackLayout.topControl = newModulesComposite;
- }
-
- /**
- * @return
- */
- private GenericWizardNode getWizardNodeFromSelection() {
- if (appClientRadioButton.getSelection())
- return getAppClientNode();
- if (connectorRadioButton != null && connectorRadioButton.getSelection())
- return getConnectorNode();
- if (ejbRadioButton != null && ejbRadioButton.getSelection())
- return getEjbNode();
- if (webRadioButton != null && webRadioButton.getSelection())
- return getWebNode();
- return null;
- }
-
- /**
- * @return
- */
- private boolean isAnyModuleRadioSelected() {
- return appClientRadioButton.getSelection() || (connectorRadioButton != null && connectorRadioButton.getSelection()) || (ejbRadioButton != null && ejbRadioButton.getSelection()) || (webRadioButton != null && webRadioButton.getSelection());
- }
-
- /**
- * @return Returns the appClientNode.
- */
- private GenericWizardNode getAppClientNode() {
- if (appClientNode == null) {
- appClientNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- protected IWizard createWizard() {
- IDataModel dm = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT).setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
- return new AppClientProjectWizard(dm);
- }
- };
- }
- return appClientNode;
- }
-
- /**
- * @return Returns the connectorNode.
- */
- private GenericWizardNode getConnectorNode() {
- if (connectorNode == null) {
- connectorNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- protected IWizard createWizard() {
- NewProjectDataModelFacetWizard result = null;
-
- IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
- IWizardDescriptor descriptor = newWizardRegistry.findWizard("org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"); //$NON-NLS-1$
- try {
- result = (NewProjectDataModelFacetWizard)descriptor.createWizard();
- IDataModel dm = result.getDataModel();
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.getFacetDataModel(J2EEProjectUtilities.JCA).setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
- } catch (CoreException ce) {
- Logger.getLogger().log(ce);
- }
- return result;
- }
- };
- }
- return connectorNode;
- }
-
- /**
- * @return Returns the ejbNode.
- */
- private GenericWizardNode getEjbNode() {
- if (ejbNode == null) {
- ejbNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- protected IWizard createWizard() {
- NewProjectDataModelFacetWizard result = null;
-
- IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
- IWizardDescriptor descriptor = newWizardRegistry.findWizard("org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"); //$NON-NLS-1$
- try {
- result = (NewProjectDataModelFacetWizard)descriptor.createWizard();
- IDataModel dm = result.getDataModel();
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.getFacetDataModel(J2EEProjectUtilities.EJB).setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
- } catch (CoreException ce) {
- Logger.getLogger().log(ce);
- }
- return result;
- }
- };
- }
- return ejbNode;
- }
-
- /**
- * @return Returns the webNode.
- */
- private GenericWizardNode getWebNode() {
- if (webNode == null) {
- webNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- protected IWizard createWizard() {
- NewProjectDataModelFacetWizard result = null;
- IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
- IWizardDescriptor servletWizardDescriptor = newWizardRegistry.findWizard("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"); //$NON-NLS-1$
- try {
- result = (NewProjectDataModelFacetWizard)servletWizardDescriptor.createWizard();
- IDataModel dm = result.getDataModel();
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB).setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
-
- } catch (CoreException ce) {
- Logger.getLogger().log(ce);
- }
- return result;
- }
- };
- }
- return webNode;
- }
-
- /**
- * @param selectedNode
- * The selectedNode to set.
- */
- private void setSelectedNode(GenericWizardNode selectedNode) {
- this.selectedNode = selectedNode;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
- */
- public boolean canFlipToNextPage() {
- if (!defaultModulesButton.getSelection())
- return selectedNode != null;
- return false;
- }
-
- /**
- * The <code>WizardSelectionPage</code> implementation of this
- * <code>IWizardPage</code> method returns the first page of the currently
- * selected wizard if there is one.
- */
- public IWizardPage getNextPage() {
- if (selectedNode == null)
- return null;
- IPluginContribution pluginContribution = new IPluginContribution() {
- public String getLocalId() {
- String id = null;
- if (selectedNode == appClientNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.appclientProjectWizard"; //$NON-NLS-1$
- } else if (selectedNode == ejbNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.ejb.ui.util.ejbProjectWizard"; //$NON-NLS-1$
- } else if (selectedNode == connectorNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.jcaProjectWizard"; //$NON-NLS-1$
- } else if (selectedNode == webNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.webProjectWizard"; //$NON-NLS-1$
- }
- return id;
- }
-
- public String getPluginId() {
- return "org.eclipse.jst.j2ee.internal.internal.internal.ui"; //$NON-NLS-1$
- }
- };
-
- if (!WorkbenchActivityHelper.allowUseOf(null,pluginContribution)) {
- return null;
- }
-
- boolean isCreated = selectedNode.isContentCreated();
- IWizard wizard = selectedNode.getWizard();
- if (wizard == null) {
- setSelectedNode(null);
- return null;
- }
- if (!isCreated) // Allow the wizard to create its pages
- wizard.addPages();
-
- return wizard.getStartingPage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#validatePage()
- */
- protected void validatePage() {
- if (!defaultModulesButton.getSelection()) {
- setPageComplete(false);
- setErrorMessage(null);
- } else
- super.validatePage();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
deleted file mode 100644
index 8de017d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
+++ /dev/null
@@ -1,368 +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.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.internal.ui.dialogs.TypeSelectionDialog2;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class NewJavaClassOptionsWizardPage extends DataModelWizardPage {
-
- protected Button publicButton;
- protected Button abstractButton;
- protected Button finalButton;
- protected ListViewer interfaceViewer;
- protected Button addButton;
- protected Button removeButton;
- protected Button inheritButton;
- protected Button constructorButton;
- protected Button mainMethodButton;
-
- /**
- * @param model
- * @param pageName
- */
- public NewJavaClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName);
- setDescription(pageDesc);
- this.setTitle(pageTitle);
- setInfopopID(IJ2EEUIContextIds.NEW_JAVA_CLASS_OPTION_WIZARD_P1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{INewJavaClassDataModelProperties.MODIFIER_ABSTRACT, INewJavaClassDataModelProperties.MODIFIER_FINAL};
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- composite.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createModifierControls(composite);
- createInterfaceControls(composite);
-
- // Separator label
- Label seperator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- seperator.setLayoutData(data);
-
- createStubsComposite(composite);
-
- publicButton.setFocus();
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
- return composite;
- }
-
- /**
- * Create controls for the modifiers
- */
- protected void createModifierControls(Composite parent) {
- Label modifiersLabel = new Label(parent, SWT.NONE);
- modifiersLabel.setText(J2EEUIMessages.JAVA_CLASS_MODIFIERS_LABEL);
- modifiersLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.makeColumnsEqualWidth = true;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- publicButton = new Button(composite, SWT.CHECK);
- publicButton.setText(J2EEUIMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(publicButton, INewJavaClassDataModelProperties.MODIFIER_PUBLIC, null);
-
- abstractButton = new Button(composite, SWT.CHECK);
- abstractButton.setText(J2EEUIMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(abstractButton, INewJavaClassDataModelProperties.MODIFIER_ABSTRACT, null);
-
- finalButton = new Button(composite, SWT.CHECK);
- finalButton.setText(J2EEUIMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(finalButton, INewJavaClassDataModelProperties.MODIFIER_FINAL, null);
- }
-
- protected void createInterfaceControls(Composite parent) {
- Label interfaceLabel = new Label(parent, SWT.NONE);
- interfaceLabel.setText(J2EEUIMessages.JAVA_CLASS_INTERFACES_LABEL);
- interfaceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING));
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- interfaceViewer = new ListViewer(composite);
- interfaceViewer.getList().setLayoutData(new GridData(GridData.FILL_BOTH));
- interfaceViewer.setContentProvider(getInterfaceContentProvider());
- interfaceViewer.setLabelProvider(getInterfaceLabelProvider());
- interfaceViewer.setInput(model.getProperty(INewJavaClassDataModelProperties.INTERFACES));
-
- Composite buttonCompo = new Composite(composite, SWT.NULL);
- layout = new GridLayout();
- layout.marginHeight = 0;
- buttonCompo.setLayout(layout);
- buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
- addButton = new Button(buttonCompo, SWT.PUSH);
- addButton.setText(J2EEUIMessages.ADD_BUTTON_LABEL);
- addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleInterfaceAddButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
-
- removeButton = new Button(buttonCompo, SWT.PUSH);
- removeButton.setText(J2EEUIMessages.REMOVE_BUTTON);
- removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleInterfaceRemoveButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- removeButton.setEnabled(false);
-
- interfaceViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- ISelection selection = event.getSelection();
- removeButton.setEnabled(!selection.isEmpty());
- }
- });
-
- }
-
- /**
- * Create the composite with all the stubs
- */
- protected void createStubsComposite(Composite parent) {
- Label stubLabel = new Label(parent, SWT.NONE);
- stubLabel.setText(J2EEUIMessages.JAVA_CLASS_METHOD_STUBS_LABEL);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- stubLabel.setLayoutData(data);
-
- Composite buttonCompo = new Composite(parent, SWT.NULL);
- buttonCompo.setLayout(new GridLayout());
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- data.horizontalIndent = 15;
- buttonCompo.setLayoutData(data);
-
- mainMethodButton = new Button(buttonCompo, SWT.CHECK);
- mainMethodButton.setText(J2EEUIMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(mainMethodButton, INewJavaClassDataModelProperties.MAIN_METHOD, null);
-
- inheritButton = new Button(buttonCompo, SWT.CHECK);
- inheritButton.setText(J2EEUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(inheritButton, INewJavaClassDataModelProperties.ABSTRACT_METHODS, null);
-
- constructorButton = new Button(buttonCompo, SWT.CHECK);
- constructorButton.setText(J2EEUIMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(constructorButton, INewJavaClassDataModelProperties.CONSTRUCTOR, null);
- }
-
- /**
- * @see IStatefulWizardPage#saveWidgetValues()
- */
- // public void saveWidgetValues() {
- // // TODO: do we want to do this here or in the concrete subclasses???
- // IDialogSettings store = getDialogSettings();
- // if (store != null)
- // store.put(getUniqueKey(""), getUniqueKey("")); //$NON-NLS-1$
- // //$NON-NLS-2$
- // DialogSettingsHelper.saveButton(inheritButton,
- // getUniqueKey(idInheritedAbstractButton), store);
- // DialogSettingsHelper.saveButton(constructorButton,
- // getUniqueKey(idSuperClassConstructorsButton), store);
- // DialogSettingsHelper.saveButton(publicButton,
- // getUniqueKey(idPublicButton), store);
- // DialogSettingsHelper.saveButton(abstractButton,
- // getUniqueKey(idAbstractButton), store);
- // DialogSettingsHelper.saveButton(finalButton, getUniqueKey(idFinalButton),
- // store);
- //
- // }
- /**
- * @see IStatefulWizardPage#restoreWidgetValues()
- */
- // public void restoreWidgetValues() {
- // IDialogSettings store = super.getDialogSettings();
- // if (store != null && store.get(getUniqueKey("")) != null) { //$NON-NLS-1$
- // DialogSettingsHelper.restoreButton(inheritButton,
- // getUniqueKey(idInheritedAbstractButton), store);
- // DialogSettingsHelper.restoreButton(constructorButton,
- // getUniqueKey(idSuperClassConstructorsButton), store);
- // DialogSettingsHelper.restoreButton(publicButton,
- // getUniqueKey(idPublicButton), store);
- // DialogSettingsHelper.restoreButton(abstractButton,
- // getUniqueKey(idAbstractButton), store);
- // DialogSettingsHelper.restoreButton(finalButton,
- // getUniqueKey(idFinalButton), store);
- // }
- // }
- /**
- * Returns the Super Interface Content Provider
- */
- protected IStructuredContentProvider getInterfaceContentProvider() {
- return new IStructuredContentProvider() {
- public Object[] getElements(Object inputElement) {
- Object[] ret = new Object[0];
- if (inputElement instanceof ArrayList) {
- ret = ((ArrayList) inputElement).toArray();
- }
- return ret;
- }
- public void dispose() {
- //Do nothing
- }
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //Default is nothing
- }
- };
- }
-
- /**
- * Returns the Super Interface Label Provider
- */
- protected ILabelProvider getInterfaceLabelProvider() {
- return new ILabelProvider() {
- public Image getImage(Object element) {
- return J2EEUIPlugin.getDefault().getImage("full/obj16/interface_obj"); //$NON-NLS-1$
- }
-
- public String getText(Object element) {
- String ret = J2EEUIMessages.EMPTY_STRING;
- if (element instanceof String)
- ret = (String) element;
- return ret;
- }
-
- public void addListener(ILabelProviderListener listener) {
- //Do nothing
- }
- public void dispose() {
- //Do nothing
- }
- public boolean isLabelProperty(Object element, String property) {
- return true;
- }
- public void removeListener(ILabelProviderListener listener) {
- //Do nothing
- }
- };
- }
-
- /**
- * Browse for a new Super Interface Class
- */
- protected void handleInterfaceAddButtonSelected() {
- IProject project = (IProject) model.getProperty(INewJavaClassDataModelProperties.PROJECT);
- IRunnableContext context = Workbench.getInstance().getActiveWorkbenchWindow();
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- // this eliminates the non-exported classpath entries
- final IJavaSearchScope scope = TypeSearchEngine.createJavaSearchScopeForAProject(javaProject, true, true);
- TypeSelectionDialog2 dialog = new TypeSelectionDialog2(getShell(),false, context, scope,IJavaSearchConstants.INTERFACE);
- dialog.setTitle(J2EEUIMessages.INTERFACE_SELECTION_DIALOG_TITLE);
- if (dialog.open() == Window.OK) {
- IType type = (IType) dialog.getFirstResult();
- String superclassFullPath = ""; //$NON-NLS-1$
- if (type != null)
- superclassFullPath = type.getFullyQualifiedName();
- interfaceViewer.add(superclassFullPath);
- }
- List valueList = Arrays.asList(interfaceViewer.getList().getItems());
- model.setProperty(INewJavaClassDataModelProperties.INTERFACES, valueList);
- }
-
- /**
- * Remove an interface from the SuperInterface List
- */
- protected void handleInterfaceRemoveButtonSelected() {
- IStructuredSelection selection = (IStructuredSelection) interfaceViewer.getSelection();
- List items = selection.toList();
- if (!items.isEmpty()) {
- Object array[] = interfaceViewer.getList().getItems();
- List valueList = new ArrayList();
-
- for (int i = 0; i < array.length; i++) {
- valueList.add(array[i]);
- }
- for (int i=0; i<items.size(); i++) {
- valueList.remove(items.get(i));
- }
- interfaceViewer.setInput(valueList);
- model.setProperty(INewJavaClassDataModelProperties.INTERFACES, valueList);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
deleted file mode 100644
index f3cb949..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
+++ /dev/null
@@ -1,616 +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.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.dialogs.TypeSelectionDialog2;
-import org.eclipse.jdt.internal.ui.viewsupport.IViewPartInputProvider;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
-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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- *
- */
-public class NewJavaClassWizardPage extends DataModelWizardPage {
-
- private Text folderText;
- private Button folderButton;
- protected Text packageText;
- protected Button packageButton;
- protected Label packageLabel;
- protected Text classText;
- protected Label classLabel;
- protected Text superText;
- protected Button superButton;
- protected Label superLabel;
- private Combo projectNameCombo;
- protected String projectType;
- private String projectName;
-
- /**
- * @param model
- * @param pageName
- */
- public NewJavaClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle,
- String moduleType) {
- super(model, pageName);
- setDescription(pageDesc);
- this.setTitle(pageTitle);
- setPageComplete(false);
- this.projectType = moduleType;
- this.projectName = null;
- }
-
- /**
- *
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{IArtifactEditOperationDataModelProperties.PROJECT_NAME,
- IArtifactEditOperationDataModelProperties.COMPONENT_NAME,
- INewJavaClassDataModelProperties.SOURCE_FOLDER,
- INewJavaClassDataModelProperties.JAVA_PACKAGE,
- INewJavaClassDataModelProperties.CLASS_NAME,
- INewJavaClassDataModelProperties.SUPERCLASS};
- }
-
- /**
- *
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- composite.setLayout(layout);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- addProjectNameGroup(composite);
- addFolderGroup(composite);
- addSeperator(composite, 3);
- addPackageGroup(composite);
- addClassnameGroup(composite);
- addSuperclassGroup(composite);
-
- folderText.setFocus();
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
- return composite;
- }
-
- /**
- * Add project group
- */
- private void addProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)); //$NON-NLS-1$
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 300;
- data.horizontalSpan = 1;
- projectNameCombo.setLayoutData(data);
- projectNameCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- super.widgetSelected(e);
- // update source folder
- if (folderText != null) {
- String sourceFolder = getDefaultJavaSourceFolder(ProjectUtilities.getProject(projectNameCombo.getText())).getFullPath().toOSString();
- if (sourceFolder != null)
- folderText.setText(sourceFolder);
- }
- }
- });
- synchHelper.synchCombo(projectNameCombo, IArtifactEditOperationDataModelProperties.PROJECT_NAME, null);
- initializeProjectList();
- new Label(parent, SWT.NONE);
- }
-
- /**
- *
- **/
- private IFolder getDefaultJavaSourceFolder(IProject project) {
-
- if (project == null)
- return null;
- IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(project);
- // Try and return the first source folder
- if (sources.length > 0) {
- try {
- return (IFolder) sources[0].getCorrespondingResource();
- } catch (Exception e) {
- return null;
- }
- }
- return null;
- }
-
- /**
- *
- */
- private void initializeProjectList() {
- IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
- List items = new ArrayList();
- for (int i = 0; i < workspaceProjects.length; i++) {
- IProject project = workspaceProjects[i];
- try {
- if (project.isAccessible() && project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- if (J2EEProjectUtilities.getJ2EEProjectType(project).equals(projectType))
- items.add(project.getName());
- }
- } catch (CoreException ce) {
- // Ignore
- }
- }
- if (items.isEmpty()) return;
- String[] names = new String[items.size()];
- for (int i = 0; i < items.size(); i++) {
- names[i] = (String) items.get(i);
- }
- projectNameCombo.setItems(names);
- IProject selectedProject = null;
- try {
- if (model !=null) {
- String projectNameFromModel = model.getStringProperty(IArtifactEditOperationDataModelProperties.COMPONENT_NAME);
- if (projectNameFromModel!=null && projectNameFromModel.length()>0)
- selectedProject = ProjectUtilities.getProject(projectNameFromModel);
- }
- } catch (Exception e) {};
- try {
- if (selectedProject == null)
- selectedProject = getSelectedProject();
- if (selectedProject != null && selectedProject.isAccessible()
- && selectedProject.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- projectNameCombo.setText(selectedProject.getName());
- model.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, selectedProject.getName());
- }
- } catch (CoreException ce) {
- // Ignore
- }
- if (projectName == null && names.length > 0)
- projectName = names[0];
-
- if ((projectNameCombo.getText() == null || projectNameCombo.getText().length() == 0) && projectName != null) {
- projectNameCombo.setText(projectName);
- model.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, projectName);
- }
-
- }
-
- /**
- * Add folder group to composite
- */
- private void addFolderGroup(Composite composite) {
- // folder
- Label folderLabel = new Label(composite, SWT.LEFT);
- folderLabel.setText(J2EEUIMessages.FOLDER_LABEL);
- folderLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- folderText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- folderText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(folderText, INewJavaClassDataModelProperties.SOURCE_FOLDER, null);
-
- folderButton = new Button(composite, SWT.PUSH);
- folderButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
- folderButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- folderButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- handleFolderButtonPressed();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
- });
- }
-
- /**
- * Add package group to composite
- */
- private void addPackageGroup(Composite composite) {
- // package
- packageLabel = new Label(composite, SWT.LEFT);
- packageLabel.setText(J2EEUIMessages.JAVA_PACKAGE_LABEL);
- packageLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- packageText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- packageText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- IPackageFragment packageFragment = getSelectedPackageFragment();
- if (packageFragment != null && packageFragment.exists()) {
- projectNameCombo.setText(packageFragment.getElementName());
- model.setProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE, packageFragment.getElementName());
- }
-
- synchHelper.synchText(packageText, INewJavaClassDataModelProperties.JAVA_PACKAGE, null);
-
- packageButton = new Button(composite, SWT.PUSH);
- packageButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
- packageButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- packageButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- handlePackageButtonPressed();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
- });
- }
-
- /**
- * Add classname group to composite
- */
- private void addClassnameGroup(Composite composite) {
- // class name
- classLabel = new Label(composite, SWT.LEFT);
- classLabel.setText(J2EEUIMessages.CLASS_NAME_LABEL);
- classLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- classText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- classText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(classText, INewJavaClassDataModelProperties.CLASS_NAME, null);
-
- new Label(composite, SWT.LEFT);
- }
-
- /**
- * Add seperator to composite
- */
- protected void addSeperator(Composite composite, int horSpan) {
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.widthHint = 300;
- // Separator label
- Label seperator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = horSpan;
- seperator.setLayoutData(data);
- }
-
- /**
- * Add superclass group to the composite
- */
- private void addSuperclassGroup(Composite composite) {
- // superclass
- superLabel = new Label(composite, SWT.LEFT);
- superLabel.setText(J2EEUIMessages.SUPERCLASS_LABEL);
- superLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- superText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- superText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(superText, INewJavaClassDataModelProperties.SUPERCLASS, null);
-
- superButton = new Button(composite, SWT.PUSH);
- superButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
- superButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- superButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- handleSuperButtonPressed();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
- });
- }
-
- /**
- * Browse for a new Destination Folder
- */
- protected void handleFolderButtonPressed() {
- ISelectionStatusValidator validator = getContainerDialogSelectionValidator();
- ViewerFilter filter = getContainerDialogViewerFilter();
- ITreeContentProvider contentProvider = new WorkbenchContentProvider();
- ILabelProvider labelProvider = new DecoratingLabelProvider(new WorkbenchLabelProvider(), PlatformUI.getWorkbench()
- .getDecoratorManager().getLabelDecorator());
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), labelProvider, contentProvider);
- dialog.setValidator(validator);
- dialog.setTitle(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_TITLE);
- dialog.setMessage(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_DESC);
- dialog.addFilter(filter);
- IProject project = ProjectUtilities.getProject(model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
- dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
- if (project != null)
- dialog.setInitialSelection(project);
- if (dialog.open() == Window.OK) {
- Object element = dialog.getFirstResult();
- try {
- if (element instanceof IContainer) {
- IContainer container = (IContainer) element;
- folderText.setText(container.getFullPath().toString());
- // dealWithSelectedContainerResource(container);
- }
- } catch (Exception ex) {
- // Do nothing
- }
-
- }
- }
-
- protected void handlePackageButtonPressed() {
- IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
- if (packRoot == null)
- return;
- IJavaElement[] packages = null;
- try {
- packages = packRoot.getChildren();
- } catch (JavaModelException e) {
- // Do nothing
- }
- if (packages == null)
- packages = new IJavaElement[0];
-
- ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider(
- JavaElementLabelProvider.SHOW_DEFAULT));
- dialog.setTitle(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_TITLE);
- dialog.setMessage(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_DESC);
- dialog.setEmptyListMessage(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE);
- dialog.setElements(packages);
- if (dialog.open() == Window.OK) {
- IPackageFragment fragment = (IPackageFragment) dialog.getFirstResult();
- if (fragment != null) {
- packageText.setText(fragment.getElementName());
- } else {
- packageText.setText(J2EEUIMessages.EMPTY_STRING);
- }
- }
- }
-
- protected void handleSuperButtonPressed() {
- getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
- IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
- if (packRoot == null)
- return;
-
- // this eliminates the non-exported classpath entries
- final IJavaSearchScope scope = TypeSearchEngine.createJavaSearchScopeForAProject(packRoot.getJavaProject(), true, true);
-
- // This includes all entries on the classpath. This behavior is
- // identical
- // to the Super Class Browse Button on the Create new Java Class Wizard
- // final IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new
- // IJavaElement[] {root.getJavaProject()} );
- TypeSelectionDialog2 dialog = new TypeSelectionDialog2(getShell(),false, getWizard().getContainer(), scope, IJavaSearchConstants.CLASS);
- dialog.setTitle(J2EEUIMessages.SUPERCLASS_SELECTION_DIALOG_TITLE);
- dialog.setMessage(J2EEUIMessages.SUPERCLASS_SELECTION_DIALOG_DESC);
-
- if (dialog.open() == Window.OK) {
- IType type = (IType) dialog.getFirstResult();
- String superclassFullPath = J2EEUIMessages.EMPTY_STRING;
- if (type != null) {
- superclassFullPath = type.getFullyQualifiedName();
- }
- superText.setText(superclassFullPath);
- getControl().setCursor(null);
- return;
- }
- getControl().setCursor(null);
- }
-
- /**
- * Returns a new instance of the Selection validator for the Container
- * Selection Dialog This method can be extended by subclasses, as it does
- * some basic validation.
- */
- protected ISelectionStatusValidator getContainerDialogSelectionValidator() {
- return new ISelectionStatusValidator() {
- public IStatus validate(Object[] selection) {
- if (selection != null && selection[0] != null && !(selection[0] instanceof IProject))
- return WTPCommonPlugin.OK_STATUS;
- return WTPCommonPlugin.createErrorStatus(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG);
- }
- };
- }
-
- /**
- * Returns a new instance of the Selection Listner for the Container
- * Selection Dialog
- */
- protected ViewerFilter getContainerDialogViewerFilter() {
- return new ViewerFilter() {
- public boolean select(Viewer viewer, Object parent, Object element) {
- if (element instanceof IProject) {
- IProject project = (IProject) element;
- return project.getName().equals(model.getProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
- } else if (element instanceof IFolder) {
- IFolder folder = (IFolder) element;
- // only show source folders
- IProject project = ProjectUtilities.getProject(model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
- IPackageFragmentRoot[] sourceFolders = J2EEProjectUtilities.getSourceContainers(project);
- for (int i = 0; i < sourceFolders.length; i++) {
- if (sourceFolders[i].getResource()!= null && sourceFolders[i].getResource().equals(folder))
- return true;
- }
- }
- return false;
- }
- };
- }
-
-
-
- /**
- * @return
- */
- private IProject getSelectedProject() {
- IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- IStructuredSelection stucturedSelection = (IStructuredSelection) selection;
- if (stucturedSelection.getFirstElement() instanceof EObject)
- return ProjectUtilities.getProject(stucturedSelection.getFirstElement());
- IJavaElement element = getInitialJavaElement(selection);
- if (element != null && element.getJavaProject() != null)
- return element.getJavaProject().getProject();
- return null;
- }
-
- /**
- * @return
- */
- private IPackageFragment getSelectedPackageFragment() {
- IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- // StructuredSelection stucturedSelection = (StructuredSelection)
- // selection;
- IJavaElement element = getInitialJavaElement(selection);
- if (element != null) {
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT)
- return (IPackageFragment) element;
- else if (element.getElementType() == IJavaElement.TYPE) {
- return ((IType) element).getPackageFragment();
- }
- }
- return null;
- }
-
- /**
- * Utility method to inspect a selection to find a Java element.
- *
- * @param selection
- * the selection to be inspected
- * @return a Java element to be used as the initial selection, or
- * <code>null</code>, if no Java element exists in the given
- * selection
- */
- protected IJavaElement getInitialJavaElement(ISelection selection) {
- IJavaElement jelem = null;
- if (selection != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
- Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
- if (selectedElement instanceof IAdaptable) {
- IAdaptable adaptable = (IAdaptable) selectedElement;
-
- jelem = (IJavaElement) adaptable.getAdapter(IJavaElement.class);
- if (jelem == null) {
- IResource resource = (IResource) adaptable.getAdapter(IResource.class);
- if (resource != null && resource.getType() != IResource.ROOT) {
- while (jelem == null && resource.getType() != IResource.PROJECT) {
- resource = resource.getParent();
- jelem = (IJavaElement) resource.getAdapter(IJavaElement.class);
- }
- if (jelem == null) {
- jelem = JavaCore.create(resource); // java project
- }
- }
- }
- }
- }
- if (jelem == null) {
- IWorkbenchPart part = JavaPlugin.getActivePage().getActivePart();
- if (part instanceof ContentOutline) {
- part = JavaPlugin.getActivePage().getActiveEditor();
- }
-
- if (part instanceof IViewPartInputProvider) {
- Object elem = ((IViewPartInputProvider) part).getViewPartInput();
- if (elem instanceof IJavaElement) {
- jelem = (IJavaElement) elem;
- }
- }
- }
-
- if (jelem == null || jelem.getElementType() == IJavaElement.JAVA_MODEL) {
- try {
- IJavaProject[] projects = JavaCore.create(getWorkspaceRoot()).getJavaProjects();
- if (projects.length == 1) {
- jelem = projects[0];
- }
- } catch (JavaModelException e) {
- JavaPlugin.log(e);
- }
- }
- return jelem;
- }
-
- protected IWorkspaceRoot getWorkspaceRoot() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleDataModelGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleDataModelGroup.java
deleted file mode 100644
index df93ccf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleDataModelGroup.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-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.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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFlexibleProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.DataModelSynchHelper;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class NewModuleDataModelGroup implements IFlexibleJavaProjectCreationDataModelProperties{
-
- private IDataModel model;
- protected Combo projectNameCombo = null;
- protected Text moduleNameText = null;
- protected Button newButton = null;
- protected Text serverTargetText;
- private DataModelSynchHelper synchHelper;
- private Composite parentComposite;
-
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- private static final String PROJECT_NAME = J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)+ ":"; //$NON-NLS-1$
- private static final String NEW_LABEL = J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E); //$NON-NLS-1$
- private static final String MODULE_NAME = J2EEUIMessages.getResourceString(J2EEUIMessages.MODULE_NAME); //$NON-NLS-1$
-
- /**
- * @param parent
- * @param style
- */
- public NewModuleDataModelGroup(Composite parent, IDataModel model, DataModelSynchHelper helper) {
- this.model = model;
- this.parentComposite = parent;
- synchHelper = helper;
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createModuleGroup(parent);
- moduleNameText.setFocus();
- createProjectNameGroup(parent);
- initializeProjectList();
- createServerTargetComposite(parent);
- addSeperator(parent,3);
- }
-
- /**
- *
- *
- */
- public void initializeProjectList() {
- IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
- List items = new ArrayList();
- for (int i=0; i<workspaceProjects.length; i++) {
- IProject project = workspaceProjects[i];
- try {
- if (project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- items.add(project.getName());
- }
- } catch (CoreException ce) {
- //Ignore
- }
- }
- String[] names = new String[items.size()];
- for (int i=0; i<items.size(); i++) {
- names[i]= (String) items.get(i);
- }
-// model.setIgnorePropertyChanges(true);
- projectNameCombo.setItems(names);
-// model.setIgnorePropertyChanges(false);
-
- if (!model.isPropertySet(IComponentCreationDataModelProperties.PROJECT_NAME)
- || model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME).length()==0) {
- IProject selectedProject = getSelectedProject();
- if (selectedProject!=null) {
- projectNameCombo.setText(selectedProject.getName());
- model.setProperty(IComponentCreationDataModelProperties.PROJECT_NAME,
- selectedProject.getName());
- }
- else if (names.length>0) {
- projectNameCombo.setText(names[0]);
- model.setProperty(IComponentCreationDataModelProperties.PROJECT_NAME, names[0]);
- }
- } else {
- projectNameCombo.add(model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- projectNameCombo.setText(model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- }
- }
-
- /**
- *
- */
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(PROJECT_NAME);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- projectNameCombo.setLayoutData(data);
- projectNameCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null){
- serverTargetText.setText(runtime.getName());
- synchHelper.getDataModel().setProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID, runtime.getName());
- }
- }
- });
- newButton = new Button(parent, SWT.NONE);
- newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- newButton.setText(NEW_LABEL);
- newButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleNewProjectSelected();
- }
- });
- synchHelper.synchCombo(projectNameCombo,
- IComponentCreationDataModelProperties.PROJECT_NAME,
- new Control[]{projectNameLabel});
- }
-
- /**
- * @return
- */
- private IProject getSelectedProject() {
- IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null || !(selection instanceof StructuredSelection))
- return null;
- StructuredSelection stucturedSelection = (StructuredSelection) selection;
- Object obj = stucturedSelection.getFirstElement();
- if (obj instanceof IProject)
- return (IProject) obj;
- return null;
- }
-
- private void handleNewProjectSelected() {
- IDataModel javaProjModel = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
- DataModelWizard newProjectWizard = new FlexibleProjectCreationWizard(javaProjModel);
- WizardDialog dialog = new WizardDialog(parentComposite.getShell(), newProjectWizard);
- if (Window.OK == dialog.open()) {
- String newProjectName = javaProjModel.getStringProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_NAME);
- projectNameCombo.add(newProjectName);
- projectNameCombo.setText(newProjectName);
- IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null){
- serverTargetText.setText(runtime.getName());
- synchHelper.getDataModel().setProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID, runtime.getName());
- }
- }
- }
-
- /**
- *
- * @param parent
- */
- private void createModuleGroup(Composite parent) {
- GridData data = new GridData();
- // Add the module name label
- Label moduleNameLabel = new Label(parent, SWT.NONE);
- moduleNameLabel.setText(MODULE_NAME);
- // Add the module name entry field
- moduleNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- moduleNameText.setLayoutData(data);
- synchHelper.synchText(moduleNameText,
- IComponentCreationDataModelProperties.COMPONENT_NAME,
- new Control[] {});
- new Label(parent,SWT.NONE);
- }
-
- /**
- *
- *
- */
- public void dispose() {
- if (synchHelper != null) {
- if (model != null)
- model.removeListener(synchHelper);
- synchHelper.dispose();
- }
- model = null;
- }
-
- /**
- *
- * @return
- */
- public String getProjectName() {
- return projectNameCombo.getText();
- }
-
- /**
- *
- * @param parent
- * @param hSpan
- */
- public void addSeperator(Composite parent, int hSpan) {
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = hSpan;
- separator.setLayoutData(gd);
- }
-
- /**
- *
- * @param parent
- */
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- serverTargetText = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
-// serverTargetText..addSelectionListener(new SelectionAdapter() {
-// public void widgetSelected(SelectionEvent e) {
-// IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
-// IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-// if (runtime != null)
-// serverTargetText.setText(runtime.getName());
-// }
-// });
-
- serverTargetText.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- new Label(parent, SWT.NONE);
- String projectName = projectNameCombo.getText();
- if (projectName!=null && projectName.length()!=0) {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project !=null) {
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null){
- serverTargetText.setText(runtime.getName());
- synchHelper.getDataModel().setProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID, runtime.getName());
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java
deleted file mode 100644
index 19d2b27..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java
+++ /dev/null
@@ -1,256 +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
- *******************************************************************************/
-/*
- * Created on Nov 3, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- *
- */
-public class NewModuleGroup implements IJ2EEComponentCreationDataModelProperties{
-
- private IDataModel model;
- protected Text moduleNameText = null;
- protected Button newButton = null;
- protected Text serverTargetText;
- private DataModelSynchHelper synchHelper;
-// private Composite parentComposite;
-
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-// private static final String NEW_LABEL_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E); //$NON-NLS-1$
- private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.MODULE_NAME); //$NON-NLS-1$
-
- /**
- * @param parent
- * @param style
- */
- public NewModuleGroup(Composite parent, int style, IDataModel model, DataModelSynchHelper syncHelper) {
- this.model = model;
-// this.parentComposite = parent;
- synchHelper = syncHelper;
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- //createProjectNameGroup(parent);
- //initializeProjectList();
- createModuleGroup(parent);
- //addSeperator(parent,3);
- //createServerTargetComposite(parent);
- }
-
- /**
- *
- *
- */
-// public void initializeProjectList() {
-// IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
-// List items = new ArrayList();
-// for (int i=0; i<workspaceProjects.length; i++) {
-// IProject project = workspaceProjects[i];
-// try {
-// if (project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-// items.add(project.getName());
-// }
-// } catch (CoreException ce) {
-// //Ignore
-// }
-// }
-// String[] names = new String[items.size()];
-// for (int i=0; i<items.size(); i++) {
-// names[i]= (String) items.get(i);
-// }
-// //model.IgnorePropertyChanges(true);
-// projectNameCombo.setItems(names);
-// //model.setIgnorePropertyChanges(false);
-//
-// if (!model.isPropertySet(PROJECT_NAME) || model.getStringProperty(PROJECT_NAME).length()==0) {
-// IProject selectedProject = getSelectedProject();
-// if (selectedProject!=null) {
-// projectNameCombo.setText(selectedProject.getName());
-// model.setProperty(PROJECT_NAME,selectedProject.getName());
-// }
-// else if (names.length>0) {
-// projectNameCombo.setText(names[0]);
-// model.setProperty(PROJECT_NAME,names[0]);
-// }
-// } else {
-// projectNameCombo.add(model.getStringProperty(PROJECT_NAME));
-// projectNameCombo.setText(model.getStringProperty(PROJECT_NAME));
-// }
-// }
-
- /**
- *
- */
-// private void createProjectNameGroup(Composite parent) {
-// // set up project name label
-// Label projectNameLabel = new Label(parent, SWT.NONE);
-// projectNameLabel.setText(PROJECT_NAME_UI);
-// GridData data = new GridData();
-// projectNameLabel.setLayoutData(data);
-// // set up project name entry field
-// projectNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
-// data = new GridData(GridData.FILL_HORIZONTAL);
-// data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-// projectNameCombo.setLayoutData(data);
-// projectNameCombo.addSelectionListener(new SelectionAdapter() {
-// public void widgetSelected(SelectionEvent e) {
-// IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
-// IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-// if (runtime != null)
-// serverTargetText.setText(runtime.getName());
-// }
-// });
-// newButton = new Button(parent, SWT.NONE);
-// newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-// newButton.setText(NEW_LABEL_UI);
-// newButton.addSelectionListener(new SelectionAdapter() {
-// public void widgetSelected(SelectionEvent e) {
-// handleNewProjectSelected();
-// }
-// });
-// synchHelper.synchCombo(projectNameCombo, PROJECT_NAME, new Control[]{projectNameLabel});
-// }
-
- /**
- * @return
- */
-// private IProject getSelectedProject() {
-// IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-// if (window == null)
-// return null;
-// ISelection selection = window.getSelectionService().getSelection();
-// if (selection == null || !(selection instanceof StructuredSelection))
-// return null;
-// StructuredSelection stucturedSelection = (StructuredSelection) selection;
-// Object obj = stucturedSelection.getFirstElement();
-// if (obj instanceof IProject)
-// return (IProject) obj;
-// return null;
-// }
-//
- /**
- *
- *
- */
-// private void handleNewProjectSelected() {
-// IDataModel projModel = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
-// FlexibleProjectCreationWizard newProjectWizard = new FlexibleProjectCreationWizard(projModel);
-// WizardDialog dialog = new WizardDialog(parentComposite.getShell(), newProjectWizard);
-// if (Window.OK == dialog.open()) {
-// String newProjectName = projModel.getStringProperty(PROJECT_NAME);
-// projectNameCombo.add(newProjectName);
-// projectNameCombo.setText(newProjectName);
-// IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
-// IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-// if (runtime != null)
-// serverTargetText.setText(runtime.getName());
-// }
-// }
-
- /**
- *
- * @param parent
- */
- private void createModuleGroup(Composite parent) {
- GridData data = new GridData();
- // Add the module name label
- Label moduleNameLabel = new Label(parent, SWT.NONE);
- moduleNameLabel.setText(MODULE_NAME_UI);
- // Add the module name entry field
- moduleNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- moduleNameText.setLayoutData(data);
- synchHelper.synchText(moduleNameText,COMPONENT_NAME,new Control[] {});
- new Label(parent,SWT.NONE);
- }
-
- /**
- *
- *
- */
- public void dispose() {
- if (synchHelper != null) {
- if (model != null)
- model.removeListener(synchHelper);
- synchHelper.dispose();
- }
- model = null;
- }
-
- /**
- *
- * @return
- */
-// public String getProjectName() {
-// return projectNameCombo.getText();
-// }
-
- /**
- *
- * @param parent
- * @param hSpan
- */
- public void addSeperator(Composite parent, int hSpan) {
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = hSpan;
- separator.setLayoutData(gd);
- }
-
- /**
- *
- * @param parent
- */
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- serverTargetText = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- serverTargetText.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- new Label(parent, SWT.NONE);
- String projectName = moduleNameText.getText();
- if (projectName!=null && projectName.length()!=0) {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project !=null) {
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null){
- serverTargetText.setText(runtime.getName());
- synchHelper.synchText(serverTargetText, RUNTIME_TARGET_ID, null);
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroupEx.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroupEx.java
deleted file mode 100644
index afa2209..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroupEx.java
+++ /dev/null
@@ -1,274 +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
- *******************************************************************************/
-/*
- * Created on Nov 3, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-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.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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFlexibleProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.DataModelSynchHelper;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- *
- */
-public class NewModuleGroupEx {
-
- private IDataModel model;
- protected Combo projectNameCombo = null;
- protected Text moduleNameText = null;
- protected Button newButton = null;
- protected Text serverTargetText;
- private DataModelSynchHelper synchHelper;
- private Composite parentComposite;
-
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- private static final String PROJECT_NAME = J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)+ ":"; //$NON-NLS-1$
- private static final String NEW_LABEL = J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E); //$NON-NLS-1$
- private static final String MODULE_NAME = J2EEUIMessages.getResourceString(J2EEUIMessages.MODULE_NAME); //$NON-NLS-1$
-
- /**
- * @param parent
- * @param style
- */
- public NewModuleGroupEx(Composite parent, int style, IDataModel model) {
- this.model = model;
- this.parentComposite = parent;
- synchHelper = new DataModelSynchHelper(model);
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createProjectNameGroup(parent);
- projectNameCombo.setFocus();
- initializeProjectList();
- createServerTargetComposite(parent);
- addSeperator(parent,3);
- createModuleGroup(parent);
- }
-
- /**
- *
- *
- */
- public void initializeProjectList() {
- IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
- List items = new ArrayList();
- for (int i=0; i<workspaceProjects.length; i++) {
- IProject project = workspaceProjects[i];
- try {
- if (project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- items.add(project.getName());
- }
- } catch (CoreException ce) {
- //Ignore
- }
- }
- String[] names = new String[items.size()];
- for (int i=0; i<items.size(); i++) {
- names[i]= (String) items.get(i);
- }
- //model.setIgnorePropertyChanges(true);
- projectNameCombo.setItems(names);
- //model.setIgnorePropertyChanges(false);
-
- if (!model.isPropertySet(IComponentCreationDataModelProperties.PROJECT_NAME) || model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME).length()==0) {
- IProject selectedProject = getSelectedProject();
- if (selectedProject!=null) {
- projectNameCombo.setText(selectedProject.getName());
- model.setProperty(IComponentCreationDataModelProperties.PROJECT_NAME,selectedProject.getName());
- }
- else if (names.length>0) {
- projectNameCombo.setText(names[0]);
- model.setProperty(IComponentCreationDataModelProperties.PROJECT_NAME,names[0]);
- }
- } else {
- projectNameCombo.add(model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- projectNameCombo.setText(model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- }
- }
-
- /**
- *
- */
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(PROJECT_NAME);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- projectNameCombo.setLayoutData(data);
- projectNameCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null)
- serverTargetText.setText(runtime.getName());
- }
- });
- newButton = new Button(parent, SWT.NONE);
- newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- newButton.setText(NEW_LABEL);
- newButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleNewProjectSelected();
- }
- });
- synchHelper.synchCombo(projectNameCombo, IComponentCreationDataModelProperties.PROJECT_NAME, new Control[]{projectNameLabel});
- }
-
- /**
- * @return
- */
- private IProject getSelectedProject() {
- IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- StructuredSelection stucturedSelection = (StructuredSelection) selection;
- Object obj = stucturedSelection.getFirstElement();
- if (obj instanceof IProject)
- return (IProject) obj;
- return null;
- }
-
- /**
- *
- *
- */
- private void handleNewProjectSelected() {
- IDataModel projModel = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
- FlexibleProjectCreationWizard newProjectWizard = new FlexibleProjectCreationWizard(projModel);
- WizardDialog dialog = new WizardDialog(parentComposite.getShell(), newProjectWizard);
- if (Window.OK == dialog.open()) {
- String newProjectName = projModel.getStringProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_NAME);
- projectNameCombo.add(newProjectName);
- projectNameCombo.setText(newProjectName);
- IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null)
- serverTargetText.setText(runtime.getName());
- }
- }
-
- /**
- *
- * @param parent
- */
- private void createModuleGroup(Composite parent) {
- GridData data = new GridData();
- // Add the module name label
- Label moduleNameLabel = new Label(parent, SWT.NONE);
- moduleNameLabel.setText(MODULE_NAME);
- // Add the module name entry field
- moduleNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- moduleNameText.setLayoutData(data);
- synchHelper.synchText(moduleNameText,IComponentCreationDataModelProperties.COMPONENT_NAME,new Control[] {});
- new Label(parent,SWT.NONE);
- }
-
- /**
- *
- *
- */
- public void dispose() {
- if (synchHelper != null) {
- if (model != null)
- model.removeListener(synchHelper);
- synchHelper.dispose();
- }
- model = null;
- }
-
- /**
- *
- * @return
- */
- public String getProjectName() {
- return projectNameCombo.getText();
- }
-
- /**
- *
- * @param parent
- * @param hSpan
- */
- public void addSeperator(Composite parent, int hSpan) {
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = hSpan;
- separator.setLayoutData(gd);
- }
-
- /**
- *
- * @param parent
- */
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- serverTargetText = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- serverTargetText.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- new Label(parent, SWT.NONE);
- String projectName = projectNameCombo.getText();
- if (projectName!=null && projectName.length()!=0) {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project !=null) {
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null)
- serverTargetText.setText(runtime.getName());
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewProjectGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewProjectGroup.java
deleted file mode 100644
index 40f980d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewProjectGroup.java
+++ /dev/null
@@ -1,142 +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
- *******************************************************************************/
-/*
- * Created on Nov 3, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationProperties;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class NewProjectGroup {
- private IDataModel projectModel;
- public Text projectNameField = null;
- protected Text locationPathField = null;
- protected Button browseButton = null;
- // constants
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- // default values
- private String defProjectNameLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL); //$NON-NLS-1$
- private String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL); //$NON-NLS-1$
- private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
- private DataModelSynchHelper synchHelper;
-
- /**
- * @param parent
- * @param style
- */
- public NewProjectGroup(Composite parent, int style, IDataModel model, DataModelSynchHelper helper) {
- projectModel = model;
- synchHelper = helper;
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createProjectNameGroup(parent);
- createProjectLocationGroup(parent);
- projectNameField.setFocus();
- }
-
- /**
- *
- */
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(defProjectNameLabel);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameField = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- projectNameField.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(projectNameField, IProjectCreationProperties.PROJECT_NAME, new Control[]{projectNameLabel});
- }
-
- /**
- *
- */
- private void createProjectLocationGroup(Composite parent) {
- // set up location path label
- Label locationPathLabel = new Label(parent, SWT.NONE);
- locationPathLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOC_LBL));
- GridData data = new GridData();
- locationPathLabel.setLayoutData(data);
- // set up location path entry field
- locationPathField = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- locationPathField.setLayoutData(data);
- // set up browse button
- browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleLocationBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
- synchHelper.synchText(locationPathField, IProjectCreationProperties.PROJECT_LOCATION, null);
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleLocationBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
- dialog.setMessage(defDirDialogLabel);
- String dirName = projectModel.getStringProperty(IProjectCreationProperties.PROJECT_LOCATION);
- if ((dirName != null) && (dirName.length() != 0)) {
- File path = new File(dirName);
- if (path.exists()) {
- dialog.setFilterPath(dirName);
- }
- }
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- projectModel.setProperty(IProjectCreationProperties.PROJECT_LOCATION, selectedDirectory);
- }
- }
-
- public void dispose() {
- projectModel = null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/PackageNameResolver.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/PackageNameResolver.java
deleted file mode 100644
index 46ec179..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/PackageNameResolver.java
+++ /dev/null
@@ -1,70 +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.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-/**
- * @author Sachin
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class PackageNameResolver extends ClassLoader {
-
- public PackageNameResolver() {
- super();
- }
-
- public String getClassName(final String classFile) {
- File file = new File(classFile);
- byte[] classbuf = new byte[(int) file.length()];
- try {
- FileInputStream instream = new FileInputStream(file);
- instream.read(classbuf);
- instream.close();
- } catch (Throwable e) {
- return null;
- }
- boolean badclassname = true;
- String classname = classFile.replace(java.io.File.separatorChar, '.');
- int endi;
- if (classname.endsWith(".class")) //$NON-NLS-1$
- endi = classname.lastIndexOf('.');
- else
- endi = classname.length();
- int i = classname.indexOf('.');
- while (i < endi && badclassname == true) {
- badclassname = false;
- try {
- defineClass(classname.substring(i + 1, endi), classbuf, 0, classbuf.length);
- } catch (java.lang.NoClassDefFoundError e) {
- String msg = e.getMessage();
- if (msg == null || msg.indexOf(' ') > 0) {
- badclassname = true;
- }
- } catch (Throwable e) {
- badclassname = true;
- }
- if (badclassname) {
- i = classname.indexOf('.', i + 1);
- if (i == -1)
- i = endi;
- }
- }
- if (badclassname)
- return null;
- return classname.substring(i + 1, endi);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java
deleted file mode 100644
index 8bc8608..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java
+++ /dev/null
@@ -1,150 +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.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.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.Label;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-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.DataModelSynchHelper;
-
-/**
- *
- */
-public class ServerEarAndStandaloneGroup implements IJ2EEComponentCreationDataModelProperties {
-
- private Button newEAR;
- private Combo earCombo;
- private Label earLabel;
- private Button addToEAR;
- private IDataModel model;
- private DataModelSynchHelper synchHelper;
- private Composite parentComposite;
-
- /**
- *
- */
- public ServerEarAndStandaloneGroup(Composite parent, IDataModel model, DataModelSynchHelper helper) {
- this.model = model;
- this.parentComposite = parent;
- synchHelper = helper;
- buildComposites(parent);
- }
-
- /**
- *
- * @param parent
- */
- public void buildComposites(Composite parent) {
- createEarAndStandaloneComposite(parent);
- }
-
- /**
- * @param parent
- */
- protected void createEarAndStandaloneComposite(Composite parent) {
-
- if (model.getBooleanProperty(UI_SHOW_EAR_SECTION)) {
-
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- separator.setLayoutData(gd);
-
- new Label(parent, SWT.NONE); //pad
-
- // Create Add to EAR checkbox
- addToEAR = new Button(parent, SWT.CHECK);
- addToEAR.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.LINK_MODULETO_EAR_PROJECT));
- addToEAR.setSelection(true);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- addToEAR.setLayoutData(gd);
- synchHelper.synchCheckbox(addToEAR, ADD_TO_EAR, null);
-
- // Create EAR Group
- earLabel = new Label(parent, SWT.NONE);
- earLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_PROJECT_FOR_MODULE_CREATION));
-
- earCombo = new Combo(parent, SWT.NONE);
- earCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- newEAR = new Button(parent, SWT.NONE);
- newEAR.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_W));
- newEAR.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- newEAR.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- handleNewEarSelected();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //do nothing
- }
-
- });
-
- Control[] deps = new Control[]{earLabel, newEAR};
- synchHelper.synchCombo(earCombo, EAR_COMPONENT_NAME, deps);
- }
- }
-
- /**
- *
- */
- protected void handleNewEarSelected() {
-
- IDataModel moduleModel = model;
-
- IDataModel earModel = DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
-
- earModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME,
- moduleModel.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
-
- FacetDataModelMap map = (FacetDataModelMap) earModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel earFacetDataModel = map.getFacetDataModel(J2EEProjectUtilities.ENTERPRISE_APPLICATION);
- int j2eeVersion = moduleModel.getIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION);
- String j2eeVerionText = J2EEVersionUtil.getJ2EETextVersion(j2eeVersion);
- earFacetDataModel.setStringProperty(IEarFacetInstallDataModelProperties.FACET_VERSION_STR,
- j2eeVerionText);
-
-
- EarProjectWizard earWizard = new EarProjectWizard(earModel);
- WizardDialog dialog = new WizardDialog(parentComposite.getShell(), earWizard);
- if (Window.OK == dialog.open()) {
- moduleModel.setProperty(EAR_COMPONENT_NAME, earModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME));
- }
- }
-
- public void dispose() {
- model.removeListener(synchHelper);
- model.dispose();
- synchHelper = null;
- model = null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java
deleted file mode 100644
index d0e6af5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java
+++ /dev/null
@@ -1,76 +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
- *******************************************************************************/
-/*
- * Created on Aug 27, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code
- * and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-
-public class ServerTargetComboHelper {
- private List targets;
- public String[] items;
- public static final String defaultId = "com.ibm.etools.websphere.serverTarget.base.v51"; //$NON-NLS-1$
- public static final String defaultExpressId = "com.ibm.etools.websphere.serverTarget.express.v51"; //$NON-NLS-1$
-
- ServerTargetComboHelper(List targets, String[] items) {
- this.targets = targets;
- this.items = items;
- }
-
- public IRuntime getSelectedTarget(int itemIndex) {
- return (IRuntime) targets.get(itemIndex);
- }
-
- /**
- * @param target
- * @return
- */
- public boolean isCompatible(IRuntime target) {
- return targets.contains(target);
- }
-
- public int getDefaultServerTargetIndex() {
- IRuntime v51TargetServer = null;
- if (J2EEPlugin.isEJBSupportAvailable())
- v51TargetServer = ResourceManager.getInstance().getRuntime(defaultId);
- else
- v51TargetServer = ResourceManager.getInstance().getRuntime(defaultExpressId);
- if (v51TargetServer != null && targets.contains(v51TargetServer))
- return targets.indexOf(v51TargetServer) + 1;
- return -1;
- }
-
- public int getServerTargetIndexFromItems(IRuntime serverTarget) {
- if (items != null && items.length > 0) {
- String serverTargetLabel = serverTarget.getName() + " (" + serverTarget.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- for (int i = 0; i < items.length; i++) {
- String label = items[i];
- if (label.equals(serverTargetLabel)) {
- return i;
- }
- }
- }
- return -1;
- }
-
- public List getValidTargets() {
- return targets;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetGroup.java
deleted file mode 100644
index d655c3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetGroup.java
+++ /dev/null
@@ -1,141 +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
- *******************************************************************************/
-/*
- * Created on Mar 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-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.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.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ServerTargetGroup implements IJ2EEProjectServerTargetDataModelProperties{
- private IDataModel model;
- private DataModelSynchHelper synchHelper;
- private Combo targetServerCombo;
- private Button newTargetServerButton;
- public Composite parentUI;
-
- /**
- *
- */
- public ServerTargetGroup() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param parent
- * @param style
- */
- public ServerTargetGroup(Composite parent, int style, IDataModel model, DataModelSynchHelper helper) {
- this.model = model;
- this.parentUI = parent;
- synchHelper = helper;
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createServerTargetGroup(parent);
- }
-
- /**
- * @param parent
- */
- private void createServerTargetGroup(Composite parent) {
- Label serverTargetLabel = new Label(parent, SWT.NONE);
- serverTargetLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- GridData data = new GridData();
- serverTargetLabel.setLayoutData(data);
-
-
- targetServerCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- targetServerCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
- newTargetServerButton = new Button(parent, SWT.NONE);
- newTargetServerButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- newTargetServerButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E));
- newTargetServerButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleNewTargetServerButtonPressed();
- }
- });
- newTargetServerButton.setEnabled(true);
-
- Control[] deps = new Control[]{serverTargetLabel, newTargetServerButton};
- synchHelper.synchCombo(targetServerCombo, RUNTIME_TARGET_ID, deps);
- }
-
- /**
- *
- */
- protected void handleNewTargetServerButtonPressed() {
- FlexibleProjectCreationWizardPage.launchNewRuntimeWizard(parentUI.getShell(), model);
- }
-
- public void dispose() {
- model.removeListener(synchHelper);
- model = null;
- }
-
- /**
- * @return Returns the targetServerCombo.
- */
- public Combo getTargetServerCombo() {
- return targetServerCombo;
- }
-
- /**
- * @param targetServerCombo
- * The targetServerCombo to set.
- */
- public void setTargetServerCombo(Combo targetServerCombo) {
- this.targetServerCombo = targetServerCombo;
- }
-
- /**
- * @return Returns the newTargetServerButton.
- */
- public Button getNewTargetServerButton() {
- return newTargetServerButton;
- }
-
- /**
- * @param newTargetServerButton
- * The newTargetServerButton to set.
- */
- public void setNewTargetServerButton(Button newTargetServerButton) {
- this.newTargetServerButton = newTargetServerButton;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java
deleted file mode 100644
index 31f6d67..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java
+++ /dev/null
@@ -1,157 +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
- *******************************************************************************/
-/*
- * Created on Aug 17, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ServerTargetUIHelper {
- /**
- *
- */
- public ServerTargetUIHelper() {
- super();
- }
-
- public static String getSelectedServerTargetString(Combo serverTargetCombo) {
- if (serverTargetCombo.getSelectionIndex() != -1)
- return serverTargetCombo.getItem(serverTargetCombo.getSelectionIndex());
- return null;
- }
-
- /**
- * @return
- */
- public static int getSelectedServerTargetStringIndex(Combo serverTargetCombo) {
- return serverTargetCombo.getSelectionIndex();
- }
-
-// private static void setServerTargetForProject(Shell shell, IProject project, IRuntime runtime) {
-// //ServerTargetHelper.cleanUpNonServerTargetClasspath(project);
-// setServerTarget(shell, project, runtime, null);
-// }
-
- /**
- * @param earProject
- * @param moduleProject
- * @return
- */
- public static boolean setModuleServerTargetIfNecessary(IProject earProject, IProject moduleProject, Shell shell) {
- IRuntime earRuntime = getProjectRuntime(earProject);
- if (earRuntime != null) {
- IRuntime moduleRuntime = getProjectRuntime(moduleProject);
- if (moduleRuntime == null) {
- return true;
- } else if (!earRuntime.getId().equals(moduleRuntime.getId())) {
- String dialogMessage = CommonEditResourceHandler.getString("Change_Module_Server_Target_Dialog_Message_UI_", new Object[]{earRuntime.getName(), moduleRuntime.getName()}); //$NON-NLS-1$
- String dialogTitle = CommonEditResourceHandler.getString("Change_Server_Target_Dialog_Title_UI_"); //$NON-NLS-1$
- MessageDialog dialog = new MessageDialog(shell, dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0);
- dialog.open();
- if (dialog.getReturnCode() == 0) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- *
- * @param project
- * @return IRuntime return the existing Target runtime on a IProject
- */
- public static IRuntime getProjectRuntime(IProject project) {
- return ServerCore.getProjectProperties(project).getRuntimeTarget();
- }
-
- // private static String getEARJ2EELevel(IProject earProject) {
- // EARNatureRuntime nature = EARNatureRuntime.getRuntime(earProject);
- // String j2eeLevel = null;
- // int natureID = nature.getJ2EEVersion();
- // switch (natureID) {
- // case (J2EEVersionConstants.J2EE_1_2_ID) :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_2_TEXT;
- // break;
- // case (J2EEVersionConstants.J2EE_1_3_ID) :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_3_TEXT;
- // break;
- // case (J2EEVersionConstants.J2EE_1_4_ID) :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_4_TEXT;
- // break;
- // default :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_4_TEXT;
- // break;
- // }
- // return j2eeLevel;
- // }
-
- public static void setServerTarget(Shell shell, IProject project, IRuntime runtime, IProgressMonitor monitor) {
-// try {
-// ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor);
-// } catch (CoreException e) {
-// Logger.getLogger().logError(e);
-// }
- }
-
-
- public static ServerTargetComboHelper getValidServerTargetComboItems(String j2eeType, String selectedVersion) {
- IRuntime[] validServerTargets = ServerUtil.getRuntimes(j2eeType, selectedVersion);
- String[] serverTargetList = null;
- if (validServerTargets.length>0) {
- int serverTargetListSize = validServerTargets.length;
- serverTargetList = new String[serverTargetListSize];
- for (int i = 0; i < validServerTargets.length; i++) {
- IRuntime runtime = validServerTargets[i];
- serverTargetList[i] = runtime.getName() + " (" + runtime.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return new ServerTargetComboHelper(Arrays.asList(validServerTargets), serverTargetList);
- }
-
- /**
- * @param project
- */
- public static void runEarValidation(IProject project) {
- try {
- IRunnableWithProgress runnable = EARValidationHelper.createValidationRunnable(project);
- runnable.run(null);
- } catch (InterruptedException ie) {
- Logger.getLogger().logError(ie);
- } catch (InvocationTargetException ite) {
- Logger.getLogger().logError(ite);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java
deleted file mode 100644
index fdea5bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java
+++ /dev/null
@@ -1,261 +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.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class StringArrayTableWizardSection extends Composite {
-
- protected class StringArrayListContentProvider implements IStructuredContentProvider {
- public boolean isDeleted(Object element) {
- return false;
- }
- public Object[] getElements(Object element) {
- if (element instanceof List) {
- return ((List) element).toArray();
- }
- return new Object[0];
- }
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- //Default nothing
- }
- public void dispose() {
- //Default nothing
- }
- }
- protected class StringArrayListLabelProvider extends LabelProvider {
- public Image getImage(Object element) {
- return labelProviderImage;
- }
- public String getText(Object element) {
- String[] array = (String[]) element;
- String s = array[0];
- return s;
- }
- }
-
- protected class AddStringArrayDialog extends Dialog {
- protected String windowTitle;
- protected String[] labelsForTextField;
- protected Text[] texts;
- protected String[] stringArray;
- /**
- * CMPFieldDialog constructor comment.
- */
- public AddStringArrayDialog(Shell shell, String windowTitle, String[] labelsForTextField) {
- super(shell);
- this.windowTitle = windowTitle;
- this.labelsForTextField = labelsForTextField;
- }
- /**
- * CMPFieldDialog constructor comment.
- */
- public Control createDialogArea(Composite parent) {
-
- Composite composite = (Composite) super.createDialogArea(parent);
- getShell().setText(windowTitle);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- composite.setLayout(layout);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- int n = labelsForTextField.length;
- texts = new Text[n];
- for (int i = 0; i < n; i++) {
- Label label = new Label(composite, SWT.LEFT);
- label.setText(labelsForTextField[i]);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- texts[i] = new Text(composite, SWT.SINGLE | SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 100;
- texts[i].setLayoutData(data);
- }
-
- // set focus
- texts[0].setFocus();
- return composite;
- }
-
- protected void okPressed() {
- int n = labelsForTextField.length;
- stringArray = new String[n];
- for (int i = 0; i < n; i++) {
- stringArray[i] = texts[i].getText();
- }
- super.okPressed();
- }
-
- public String[] getStringArray() {
- return stringArray;
- }
- }
-
- private TableViewer viewer;
- private Button addButton;
- private Button removeButton;
- private String title;
- private String[] labelsForText;
- private IDataModel model;
- private String propertyName;
- private Image labelProviderImage;
-
- public StringArrayTableWizardSection(Composite parent, String title, String addButtonLabel, String removeButtonLabel, String[] labelsForText, Image labelProviderImage,
- IDataModel model, String propertyName) {
- super(parent, SWT.NONE);
- this.title = title;
- this.labelsForText = labelsForText;
- this.labelProviderImage = labelProviderImage;
- this.model = model;
- this.propertyName = propertyName;
-
- GridLayout layout = new GridLayout(2, false);
- layout.marginHeight = 4;
- layout.marginWidth = 0;
- this.setLayout(layout);
- this.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label titleLabel = new Label(this, SWT.LEFT);
- titleLabel.setText(title);
- GridData data = new GridData();
- data.horizontalSpan = 2;
- titleLabel.setLayoutData(data);
-
- viewer = new TableViewer(this);
- viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.setContentProvider(new StringArrayListContentProvider());
- viewer.setLabelProvider(new StringArrayListLabelProvider());
-
- Composite buttonCompo = new Composite(this, SWT.NULL);
- layout = new GridLayout();
- layout.marginHeight = 0;
- buttonCompo.setLayout(layout);
- buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
- addButton = new Button(buttonCompo, SWT.PUSH);
- addButton.setText(addButtonLabel);
- addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
-
- removeButton = new Button(buttonCompo, SWT.PUSH);
- removeButton.setText(removeButtonLabel);
- removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- removeButton.setEnabled(false);
-
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- ISelection selection = event.getSelection();
- removeButton.setEnabled(!selection.isEmpty());
- }
- });
- }
-
- private void handleAddButtonSelected(SelectionEvent event) {
- AddStringArrayDialog dialog = new AddStringArrayDialog(getShell(), title, labelsForText);
- dialog.open();
- String[] stringArray = dialog.getStringArray();
- addStringArray(stringArray);
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event) {
- ISelection selection = viewer.getSelection();
- if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
- return;
- Object selectedObj = ((IStructuredSelection) selection).getFirstElement();
- removeStringArray(selectedObj);
- }
-
- public void addStringArray(String[] stringArray) {
- List valueList = new ArrayList();
- if (stringArray == null)
- return;
- valueList = (List) viewer.getInput();
- if (valueList == null)
- valueList = new ArrayList();
- valueList.add(stringArray);
- setInput(valueList);
- }
-
- public void removeStringArray(Object selectedStringArray) {
- List valueList = (List) viewer.getInput();
- valueList.remove(selectedStringArray);
- setInput(valueList);
- }
-
- public void setInput(List input) {
- viewer.setInput(input);
- // Create a new list to trigger property change
- List newInput = new ArrayList();
- newInput.addAll(input);
- model.setProperty(propertyName, newInput);
- }
-
- public TableViewer getTableViewer() {
- return viewer;
- }
-
- public Button getAddButton() {
- return addButton;
- }
-
- public Button getRemoveButton() {
- return removeButton;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java
deleted file mode 100644
index c480d0b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java
+++ /dev/null
@@ -1,42 +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.jst.j2ee.internal.wizard;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Insert the type's description here. Creation date: (3/19/2001 5:10:14 PM)
- *
- * @author: Administrator
- */
-public class TableObjects {
- public List tableObjectsList;
-
- /**
- * EJBs constructor comment.
- */
- public TableObjects() {
- super();
- tableObjectsList = new ArrayList();
- }
-
- public List getTableObjects() {
- return tableObjectsList;
- }
-
- protected void initList() {
- if (tableObjectsList == null)
- tableObjectsList = new ArrayList();
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportMainPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportMainPage.java
deleted file mode 100644
index 235f013..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportMainPage.java
+++ /dev/null
@@ -1,135 +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
- *******************************************************************************/
-/*
- * Created on May 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.List;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * @author Sachin
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WizardClassesImportMainPage extends WizardPage {
- Composite composite;
-
- protected Button importFromDir;
- protected Button importFromZip;
-
- private List dragAndDropFileNames = null;
-
- /**
- * @param pageName
- */
- public WizardClassesImportMainPage(String pageName) {
- super(pageName);
- setTitle(J2EEUIMessages.getResourceString("DataTransfer.fileSystemTitle")); //$NON-NLS-1$
- setDescription(J2EEUIMessages.getResourceString("FileImport.importFileSystem")); //$NON-NLS-1$
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
- }
-
- public WizardClassesImportMainPage(String pageName, List fileNames) {
- super(pageName);
- setTitle(J2EEUIMessages.getResourceString("DataTransfer.fileSystemTitle")); //$NON-NLS-1$
- setDescription(J2EEUIMessages.getResourceString("FileImport.importFileSystem")); //$NON-NLS-1$
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
- dragAndDropFileNames = fileNames;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.IMPORT_CLASS_WIZARD_P1);
- initializeDialogUnits(parent);
- Composite aComposite = new Composite(parent, SWT.NULL);
- aComposite.setLayout(new GridLayout());
- aComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
- aComposite.setSize(aComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- aComposite.setFont(parent.getFont());
- createImportTypeGroup(aComposite);
- setControl(aComposite);
- }
-
- protected void createImportTypeGroup(Composite parent) {
- Composite importTypeGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- importTypeGroup.setLayout(layout);
- importTypeGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
- //importTypeGroup.setText(WorkbenchMessages.getString("WizardExportPage.options"));
- // //$NON-NLS-1$
-
- SelectionListener selectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- IWizard wiz = getWizard();
- if (((ClassesImportWizard) wiz).page1 != null) {
- ((ClassesImportWizard) wiz).page1.blankPage();
- }
- }
- };
- importFromDir = new Button(importTypeGroup, SWT.RADIO);
- importFromDir.setText(J2EEUIMessages.getResourceString("ClassesImport.fromDir")); //$NON-NLS-1$
- importFromDir.addSelectionListener(selectionListener);
-
- importFromZip = new Button(importTypeGroup, SWT.RADIO);
- importFromZip.setText(J2EEUIMessages.getResourceString("ClassesImport.fromZip")); //$NON-NLS-1$
- importFromZip.addSelectionListener(selectionListener);
-
- IWizard wiz = getWizard();
- String fileName = null;
- if (((ClassesImportWizard) wiz).fileNames != null)
- fileName = ((ClassesImportWizard) wiz).fileNames.get(0).toString();
- if (fileName != null && (fileName.endsWith(".zip") || fileName.endsWith(".jar"))) { //$NON-NLS-1$ //$NON-NLS-2$
- importFromDir.setSelection(false);
- importFromZip.setSelection(true);
- } else {
- importFromDir.setSelection(true);
- importFromZip.setSelection(false);
- }
- }
-
- protected boolean isSetImportFromDir() {
- if (importFromDir != null)
- return importFromDir.getSelection();
-
- String fileName = dragAndDropFileNames.get(0).toString();
- if (fileName != null && (fileName.endsWith(".zip") || fileName.endsWith(".jar"))) { //$NON-NLS-1$ //$NON-NLS-2$
- return false;
- }
- return true;
- }
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportPage1.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportPage1.java
deleted file mode 100644
index c423470..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportPage1.java
+++ /dev/null
@@ -1,1442 +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.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.FileSystemElement;
-import org.eclipse.ui.dialogs.WizardResourceImportPage;
-import org.eclipse.ui.internal.dialogs.DialogUtil;
-import org.eclipse.ui.internal.ide.dialogs.IElementFilter;
-import org.eclipse.ui.internal.ide.dialogs.ResourceTreeAndListGroup;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.model.WorkbenchViewerSorter;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-
-/**
- * Page 1 of the base resource import-from-file-system Wizard
- */
-/* package */
-class WizardClassesImportPage1 extends WizardResourceImportPage implements Listener {
-
- // widgets
- protected Combo sourceNameField;
- protected Button overwriteExistingResourcesCheckbox;
- protected Button createContainerStructureButton;
- protected Button createOnlySelectedButton;
- protected Button sourceBrowseButton;
- //protected Button selectTypesButton;
- protected Button selectAllButton;
- protected Button deselectAllButton;
- //A boolean to indicate if the user has typed anything
- private boolean entryChanged = false;
-
- // dialog store id constants
- private final static String STORE_SOURCE_NAMES_ID = "WizardFileSystemResourceImportPage1.STORE_SOURCE_NAMES_ID"; //$NON-NLS-1$
- //$NON-NLS-1$
- //private final static String STORE_OVERWRITE_EXISTING_RESOURCES_ID =
- // "WizardFileSystemResourceImportPage1.STORE_OVERWRITE_EXISTING_RESOURCES_ID"; //$NON-NLS-1$
- //$NON-NLS-1$
- //private final static String STORE_CREATE_CONTAINER_STRUCTURE_ID =
- // "WizardFileSystemResourceImportPage1.STORE_CREATE_CONTAINER_STRUCTURE_ID"; //$NON-NLS-1$
- //$NON-NLS-1$
-
- //private static final String SELECT_TYPES_TITLE = "DataTransfer.selectTypes"; //$NON-NLS-1$
- private static final String SELECT_ALL_TITLE = J2EEUIMessages.getResourceString("DataTransfer.selectAll"); //$NON-NLS-1$
- private static final String DESELECT_ALL_TITLE = J2EEUIMessages.getResourceString("DataTransfer.deselectAll"); //$NON-NLS-1$
- private static final String SELECT_SOURCE_MESSAGE = J2EEUIMessages.getResourceString("FileImport.selectSource"); //$NON-NLS-1$
- protected static final String SOURCE_EMPTY_MESSAGE = J2EEUIMessages.getResourceString("FileImport.sourceEmpty"); //$NON-NLS-1$
-
- private IPath importedClassesPath;
- //protected Button importFromDir;
- //protected Button importFromZip;
-
-
- private ZipFileStructureProvider providerCache;
- ZipFileStructureProvider currentProvider;
-
- private static final String FILE_IMPORT_MASK = "*.jar;*.zip"; //$NON-NLS-1$
-
- private List dragAndDropFileNames = null;
-
- boolean createFullStructure = false;
- private String packageBaseDirName = null;
-
- //private MinimizedFileSystemElement test = null;
-
- //private Composite dummyParent = null;
-
- //private final static int SIZING_SELECTION_WIDGET_WIDTH = 400;
- //private final static int SIZING_SELECTION_WIDGET_HEIGHT = 150;
-
- private String packageDirStruc = null;
-
- /**
- * Creates an instance of this class
- */
- protected WizardClassesImportPage1(String name, IWorkbench aWorkbench, IStructuredSelection selection) {
- super(name, selection);
- }
-
- /**
- * Creates an instance of this class
- *
- * @param aWorkbench
- * IWorkbench
- * @param selection
- * IStructuredSelection
- */
- public WizardClassesImportPage1(IWorkbench aWorkbench, IStructuredSelection selection, IPath importedClassesPath, List fileNames) {
- this("fileSystemImportPage1", aWorkbench, selection); //$NON-NLS-1$
- setTitle(J2EEUIMessages.getResourceString("DataTransfer.fileSystemTitle")); //$NON-NLS-1$
- setDescription(J2EEUIMessages.getResourceString("FileImport.importFileSystem")); //$NON-NLS-1$
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
- this.importedClassesPath = importedClassesPath;
- if (fileNames != null && fileNames.size() != 0) {
- dragAndDropFileNames = fileNames;
- }
- }
-
- public void blankPage() {
- if (this.selectionGroup != null)
- this.selectionGroup.setRoot(null);
- if (sourceNameField != null)
- sourceNameField.setText(""); //$NON-NLS-1$
- }
-
- protected void createFileSelectionGroup(Composite parent) {
-
- //Just create with a dummy root.
- this.selectionGroup = new ResourceTreeAndListGroup(parent, new FileSystemElement("Dummy", null, true), //$NON-NLS-1$
- getFolderProvider(), new WorkbenchLabelProvider(), getFileProvider(),
- //new WorkbenchLabelProviderForClassImport(),
- new WorkbenchLabelProvider(), SWT.NONE, DialogUtil.inRegularFontMode(parent));
-
- ICheckStateListener listener = new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- updateWidgetEnablements();
- }
- };
-
- WorkbenchViewerSorter sorter = new WorkbenchViewerSorter();
- this.selectionGroup.setTreeSorter(sorter);
- this.selectionGroup.setListSorter(sorter);
- this.selectionGroup.addCheckStateListener(listener);
- }
-
- /**
- * Creates a new button with the given id.
- * <p>
- * The <code>Dialog</code> implementation of this framework method creates a standard push
- * button, registers for selection events including button presses and registers default buttons
- * with its shell. The button id is stored as the buttons client data. Note that the parent's
- * layout is assumed to be a GridLayout and the number of columns in this layout is incremented.
- * Subclasses may override.
- * </p>
- *
- * @param parent
- * the parent composite
- * @param id
- * the id of the button (see <code>IDialogConstants.*_ID</code> constants for
- * standard dialog button ids)
- * @param label
- * the label from the button
- * @param defaultButton
- * <code>true</code> if the button is to be the default button, and
- * <code>false</code> otherwise
- */
- protected Button createButton(Composite parent, int id, String label, boolean defaultButton) {
- // increment the number of columns in the button bar
- ((GridLayout) parent.getLayout()).numColumns++;
-
- Button button = new Button(parent, SWT.PUSH);
-
- GridData buttonData = new GridData(GridData.FILL_HORIZONTAL);
- button.setLayoutData(buttonData);
-
- button.setData(new Integer(id));
- button.setText(label);
-
- if (defaultButton) {
- Shell shell = parent.getShell();
- if (shell != null) {
- shell.setDefaultButton(button);
- }
- button.setFocus();
- }
- return button;
- }
-
- /**
- * Creates the buttons for selecting specific types or selecting all or none of the elements.
- *
- * @param parent
- * the parent control
- */
- protected final void createButtonsGroup(Composite parent) {
- // top level group
- Composite buttonComposite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
-
- layout.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(layout);
- buttonComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
-
- // types edit button
- // selectTypesButton = createButton(buttonComposite, IDialogConstants.SELECT_TYPES_ID,
- // SELECT_TYPES_TITLE, false);
-
- SelectionListener listener = new SelectionAdapter() {
- // public void widgetSelected(SelectionEvent e) {
- // handleTypesEditButtonPressed();
- // }
- };
- // selectTypesButton.addSelectionListener(listener);
-
- selectAllButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, SELECT_ALL_TITLE, false);
-
- listener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- setAllSelections(true);
- }
- };
- selectAllButton.addSelectionListener(listener);
-
- deselectAllButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, DESELECT_ALL_TITLE, false);
-
- listener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- setAllSelections(false);
- }
- };
- deselectAllButton.addSelectionListener(listener);
-
- }
-
- /**
- * (non-Javadoc) Method declared on IDialogPage.
- */
- public void createControl(Composite parent) {
- //super.createControl(parent);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.IMPORT_CLASS_WIZARD_P2);
- initializeDialogUnits(parent);
-
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- composite.setFont(parent.getFont());
-
- //dummyParent = composite;
-
- createSourceGroup(composite);
-
- //createSpacer(composite);
-
- //createPlainLabel(composite,
- // WorkbenchMessages.getString("WizardImportPage.destinationLabel")); //$NON-NLS-1$
- //createDestinationGroup(composite);
-
- createOptionsGroup(composite);
-
- restoreWidgetValues();
- updateWidgetEnablements();
- setPageComplete(determinePageCompletion());
-
- setControl(composite);
-
- validateSourceGroup();
- //WorkbenchHelp.setHelp(getControl(),
- // IDataTransferHelpContextIds.FILE_SYSTEM_IMPORT_WIZARD_PAGE);
- }
-
- protected void createOptionsGroup(Composite parent) {
- Composite optionsGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- optionsGroup.setLayout(layout);
- optionsGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
- createOptionsGroupButtons(optionsGroup);
-
- }
-
- /**
- * Create the import options specification widgets.
- */
- protected void createOptionsGroupButtons(Composite optionsGroup) {
-
- // overwrite... checkbox
- overwriteExistingResourcesCheckbox = new Button(optionsGroup, SWT.CHECK);
- overwriteExistingResourcesCheckbox.setText(J2EEUIMessages.getResourceString("FileImport.overwriteExisting")); //$NON-NLS-1$
- }
-
- protected boolean isSetImportFromDir() {
- ClassesImportWizard ciw = (ClassesImportWizard) getWizard();
- return ciw.mainPage.isSetImportFromDir();
- }
-
- public String getClassFileDirectory(String s) {
- int index = s.lastIndexOf(File.separatorChar);
- return s.substring(0, index + 1);
- }
-
- /**
- * Create the group for creating the root directory
- */
- protected void createRootDirectoryGroup(Composite parent) {
- Composite sourceContainerGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- sourceContainerGroup.setLayout(layout);
- sourceContainerGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
- new Label(sourceContainerGroup, SWT.NONE).setText(getSourceLabel());
-
- // source name entry field
- sourceNameField = new Combo(sourceContainerGroup, SWT.BORDER);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- sourceNameField.setLayoutData(data);
-
- setSourceNameFieldForDragAndDrop();
-
- sourceNameField.addListener(SWT.Modify, this);
-
- sourceNameField.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateFromSourceField();
-
- }
- });
-
- sourceNameField.addKeyListener(new KeyListener() {
- /*
- * @see KeyListener.keyPressed
- */
- public void keyPressed(KeyEvent e) {
- //If there has been a key pressed then mark as dirty
- entryChanged = true;
-
- }
-
- /*
- * @see KeyListener.keyReleased
- */
- public void keyReleased(KeyEvent e) {
- //do nothing
- }
- });
-
- sourceNameField.addFocusListener(new FocusListener() {
- /*
- * @see FocusListener.focusGained(FocusEvent)
- */
- public void focusGained(FocusEvent e) {
- //Do nothing when getting focus
- if (dragAndDropFileNames != null) {
- sourceNameField.setEnabled(false);
- }
-
- }
-
- /*
- * @see FocusListener.focusLost(FocusEvent)
- */
- public void focusLost(FocusEvent e) {
- //Clear the flag to prevent constant update
- if (entryChanged) {
-
- entryChanged = false;
- updateFromSourceField();
- }
-
- }
- });
-
- // source browse button
- sourceBrowseButton = new Button(sourceContainerGroup, SWT.PUSH);
- sourceBrowseButton.setText(J2EEUIMessages.getResourceString("DataTransfer.browse")); //$NON-NLS-1$
- sourceBrowseButton.addListener(SWT.Selection, this);
- sourceBrowseButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- if (dragAndDropFileNames != null) {
- sourceBrowseButton.setEnabled(false);
- }
-
- }
-
- private void setSourceNameFieldForDragAndDrop() {
- if (dragAndDropFileNames != null) {
- String fileName = (String) (dragAndDropFileNames.get(0));
- sourceNameField.setText(fileName);
- File f = new File(fileName);
- if (f.isFile()) {
- if (ImportUtil.getExtension(f).equals("zip") || ImportUtil.getExtension(f).equals("jar")) { //$NON-NLS-1$ //$NON-NLS-2$
- //importFromZip.setSelection(true);
- //importFromDir.setSelection(false);
- } else if (ImportUtil.getExtension(f).equals("class")) { //$NON-NLS-1$
- sourceNameField.setText(getClassFileDirectory(fileName));
-
- //get com.ibm.abc.ClassName
- PackageNameResolver nameResolver = new PackageNameResolver();
- String qualifiedClassName = nameResolver.getClassName(fileName);
- if (qualifiedClassName != null) {
-
- //get com
- int index = qualifiedClassName.indexOf('.');
- if (index == -1) {
- String textToSet = fileName.substring(0, 1 + fileName.lastIndexOf(File.separatorChar));
- sourceNameField.setText(textToSet);
- return;
- }
- String baseDir = qualifiedClassName.substring(0, index);
-
- //get com.ibm.abc
- index = qualifiedClassName.lastIndexOf('.');
- String packageName = qualifiedClassName.substring(0, index);
- //get com/ibm/abc
- packageDirStruc = packageName.replace('.', File.separatorChar);
-
- //get C:\com
- index = fileName.indexOf(baseDir);
- //if packageDirStuc exists then set the sourceDir to com, else
- //set the directory to the parent directory of the class
- if (fileName.indexOf(packageDirStruc) != -1) {
- int baseDirLength = baseDir.length();
- String textToSet = fileName.substring(0, index + baseDirLength);
- index = packageName.indexOf('.');
- if (index == -1)
- packageBaseDirName = packageName;
- else
- packageBaseDirName = packageName.substring(0, index);
-
- f = new File(textToSet);
- if (f.getParent() != null)
- f = new File(f.getParent());
- textToSet = f.getAbsolutePath(); //want to set the root directory to
- // com's parent
- sourceNameField.setText(textToSet);
- }
- }
-
- }
- }
- }
- }
-
- /**
- * Update the receiver from the source name field.
- */
-
- private void updateFromSourceField() {
-
- setSourceName(sourceNameField.getText());
- //Update enablements when this is selected
- updateWidgetEnablements();
- }
-
- /**
- * Creates and returns a <code>FileSystemElement</code> if the specified file system object
- * merits one. The criteria for this are: Also create the children.
- */
- protected MinimizedFileSystemElement createRootElement(Object fileSystemObject, IImportStructureProvider provider) {
- boolean isContainer = provider.isFolder(fileSystemObject);
- String elementLabel = provider.getLabel(fileSystemObject);
-
- // Use an empty label so that display of the element's full name
- // doesn't include a confusing label
- MinimizedFileSystemElement dummyParent = new MinimizedFileSystemElement("", null, true); //$NON-NLS-1$
- dummyParent.setPopulated();
- MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, dummyParent, isContainer);
-
- result.setPackageBaseDirName(packageBaseDirName);
- result.setFileSystemObject(fileSystemObject);
-
- //Get the files for the element so as to build the first level
- result.getFiles(provider);
-
- return dummyParent;
- }
-
- /**
- * Create the import source specification widgets
- */
- protected void createSourceGroup(Composite parent) {
- //createImportTypeGroup(parent);
- createRootDirectoryGroup(parent);
- createFileSelectionGroup(parent);
-
- createButtonsGroup(parent);
- }
-
- /**
- * Enable or disable the button group.
- */
- protected void enableButtonGroup(boolean enable) {
- // selectTypesButton.setEnabled(enable);
- selectAllButton.setEnabled(enable);
- deselectAllButton.setEnabled(enable);
- }
-
- /**
- * Answer a boolean indicating whether the specified source currently exists and is valid
- */
- protected boolean ensureSourceIsValid() {
- if (isSetImportFromDir()) {
- if (getSourceDirectory() != null && new File(getSourceDirectoryName()).isDirectory())
- return true;
- displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
- sourceNameField.setFocus();
- return false;
- }
- ZipFile specifiedFile = getSpecifiedSourceFile();
-
- if (specifiedFile == null) {
- displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
- sourceNameField.setFocus();
- return false;
- }
- return closeZipFile(specifiedFile);
- }
-
- /**
- * Execute the passed import operation. Answer a boolean indicating success.
- */
- protected boolean executeImportOperation(ImportOperation op) {
- initializeOperation(op);
- if (createFullStructure) {
- op.setCreateContainerStructure(true);
- } else {
- op.setCreateContainerStructure(false);
- }
-
- try {
- getContainer().run(true, true, op);
- } catch (InterruptedException e) {
- return false;
- } catch (InvocationTargetException e) {
- displayErrorDialog(e.getTargetException());
- return false;
- }
-
- IStatus status = op.getStatus();
- if (!status.isOK()) {
- ErrorDialog.openError(getContainer().getShell(), getString("FileImport.importProblems"), //$NON-NLS-1$
- null, // no special message
- status);
- return false;
- }
-
- return true;
- }
-
- // need the following private stuff just because the DataTransferMessages class is not public!
- //private static final String RESOURCE_BUNDLE = "org.eclipse.ui.wizards.datatransfer.messages";
- // //$NON-NLS-1$
- //private static ResourceBundle bundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
- private static String getString(String key) {
- try {
- return J2EEUIMessages.getResourceString(key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * The Finish button was pressed. Try to do the required work now and answer a boolean
- * indicating success. If false is returned then the wizard will not close.
- *
- * @return boolean
- */
- public boolean finish() {
- if (!ensureSourceIsValid())
- return false;
-
- clearProviderCache();
-
- saveWidgetValues();
-
- Iterator resourcesEnum = getSelectedResources().iterator();
- List fileSystemObjects = new ArrayList();
- while (resourcesEnum.hasNext()) {
- fileSystemObjects.add(((FileSystemElement) resourcesEnum.next()).getFileSystemObject());
- }
-
- if (fileSystemObjects.size() > 0) {
- if (getSourceDirectory() != null) {
- return importResources(fileSystemObjects);
- }
- return importResourcesFromZip(fileSystemObjects);
- }
-
- MessageDialog.openInformation(getContainer().getShell(), getString("DataTransfer.information"), //$NON-NLS-1$
- getString("FileImport.noneSelected")); //$NON-NLS-1$
-
- return false;
- }
-
- /**
- * Returns a content provider for <code>FileSystemElement</code> s that returns only files as
- * children.
- */
-
- protected ITreeContentProvider getFileProvider() {
- return new WorkbenchContentProvider() {
- public Object[] getChildren(Object o) {
- if (o instanceof MinimizedFileSystemElement) {
- MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
- if (currentProvider != null) {
- return element.getFiles(currentProvider).getChildren(element);
- }
- return element.getFiles(FileSystemStructureProvider.INSTANCE).getChildren(element);
- }
- return new Object[0];
- }
-
- public Object[] getElements(Object element) {
- Object[] superObjects = super.getElements(element);
- if (dragAndDropFileNames != null && getSourceDirectory() != null) {
- MinimizedFileSystemElement anElement = null;
- int newObjectsIndex = 0;
- for (int i = 0; i < superObjects.length; i++) {
- anElement = (MinimizedFileSystemElement) superObjects[i];
-
- File file = (File) anElement.getFileSystemObject();
-
- for (int k = 0; k < dragAndDropFileNames.size(); k++) {
- if (file.getAbsolutePath().equals(dragAndDropFileNames.get(k))) {
- newObjectsIndex++;
- }
- }
- }
- if (newObjectsIndex > 0) {
- Object[] newObjects = new Object[newObjectsIndex];
- newObjectsIndex = 0;
-
- for (int i = 0; i < superObjects.length; i++) {
- anElement = (MinimizedFileSystemElement) superObjects[i];
-
- File file = (File) anElement.getFileSystemObject();
-
- for (int k = 0; k < dragAndDropFileNames.size(); k++) {
- if (file.getAbsolutePath().equals(dragAndDropFileNames.get(k))) {
-
- newObjects[newObjectsIndex++] = anElement;
-
- }
- }
-
- }
- return newObjects;
- }
- }
- return superObjects;
- }
- };
- }
-
- /**
- * Answer the root FileSystemElement that represents the contents of the currently-specified
- * source. If this FileSystemElement is not currently defined then create and return it.
- */
- protected MinimizedFileSystemElement getFileSystemTree() {
- if (isSetImportFromDir()) {
- File sourceDirectory = getSourceDirectory();
- if (sourceDirectory != null) {
- return selectFiles(sourceDirectory, FileSystemStructureProvider.INSTANCE);
- }
- if (sourceNameField.getText().length() > 0) {
- displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
- sourceNameField.setFocus();
- }
- return null;
- }
- ZipFile sourceFile = getSpecifiedSourceFile();
- if (sourceFile == null) {
- //Clear out the provider as well
- this.currentProvider = null;
- if (sourceNameField.getText().length() > 0) {
- displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
- sourceNameField.setFocus();
- }
- return null;
- }
-
- ZipFileStructureProvider provider = getStructureProvider(sourceFile);
- this.currentProvider = provider;
- return selectFiles(provider.getRoot(), provider);
- }
-
- /**
- * Returns a content provider for <code>FileSystemElement</code> s that returns only folders
- * as children.
- */
- protected ITreeContentProvider getFolderProvider() {
- return new WorkbenchContentProvider() {
- public Object[] getChildren(Object o) {
- if (o instanceof MinimizedFileSystemElement) {
- MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
- if (currentProvider != null) {
- return element.getFolders(currentProvider).getChildren(element);
- }
- return element.getFolders(FileSystemStructureProvider.INSTANCE).getChildren(element);
- }
- return new Object[0];
- }
-
- public boolean hasChildren(Object o) {
- if (o instanceof MinimizedFileSystemElement) {
- MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
- if (element.isPopulated())
- return getChildren(element).length > 0;
- //If we have not populated then wait until asked
- return true;
- }
- return false;
- }
-
- };
- }
-
- /**
- * Returns a File object representing the currently-named source directory iff it exists as a
- * valid directory, or <code>null</code> otherwise.
- */
- protected File getSourceDirectory() {
- return getSourceDirectory(this.sourceNameField.getText());
- }
-
- /**
- * Returns a File object representing the currently-named source directory iff it exists as a
- * valid directory, or <code>null</code> otherwise.
- *
- * @param path
- * a String not yet formatted for java.io.File compatability
- */
- private File getSourceDirectory(String path) {
- if (isSetImportFromDir()) {
- File sourceDirectory = new File(getSourceDirectoryName(path));
- if (!sourceDirectory.exists() || !sourceDirectory.isDirectory()) {
- return null;
- }
-
- return sourceDirectory;
- }
- return null;
- }
-
- /**
- * Answer the directory name specified as being the import source. Note that if it ends with a
- * separator then the separator is first removed so that java treats it as a proper directory
- */
- private String getSourceDirectoryName() {
- return getSourceDirectoryName(this.sourceNameField.getText());
- }
-
- /**
- * Answer the directory name specified as being the import source. Note that if it ends with a
- * separator then the separator is first removed so that java treats it as a proper directory
- */
- private String getSourceDirectoryName(String sourceName) {
- IPath result = new Path(sourceName.trim());
-
- if (result.getDevice() != null && result.segmentCount() == 0) // something like "c:"
- result = result.addTrailingSeparator();
- else
- result = result.removeTrailingSeparator();
-
- return result.toOSString();
- }
-
- /**
- * Answer the string to display as the label for the source specification field
- */
- protected String getSourceLabel() {
- return J2EEUIMessages.getResourceString("DataTransfer.directory"); //$NON-NLS-1$
- }
-
- /**
- * Handle all events and enablements for widgets in this dialog
- *
- * @param event
- * Event
- */
- public void handleEvent(Event event) {
- if (event.widget == sourceBrowseButton) {
- if (isSetImportFromDir()) {
- handleSourceBrowseButtonPressed();
- } else {
- handleSourceBrowseButtonPressedForZip();
- }
- }
-
- super.handleEvent(event);
-
- }
-
- /**
- * Open an appropriate source browser so that the user can specify a source to import from
- */
- protected void handleSourceBrowseButtonPressed() {
- String currentSource = this.sourceNameField.getText();
- DirectoryDialog dialog = new DirectoryDialog(sourceNameField.getShell(), SWT.SAVE);
- dialog.setMessage(SELECT_SOURCE_MESSAGE);
- dialog.setFilterPath(getSourceDirectoryName(currentSource));
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- //Just quit if the directory is not valid
- if ((getSourceDirectory(selectedDirectory) == null) || selectedDirectory.equals(currentSource))
- return;
- //If it is valid then proceed to populate
- setErrorMessage(null);
- setSourceName(selectedDirectory);
- selectionGroup.setFocus();
- }
- }
-
- /**
- * Open a registered type selection dialog and note the selections in the receivers
- * types-to-export field., Added here so that inner classes can have access
- */
- protected void handleTypesEditButtonPressed() {
-
- super.handleTypesEditButtonPressed();
- }
-
- /**
- * Import the resources with extensions as specified by the user
- */
- protected boolean importResources(List fileSystemObjects) {
- Iterator i = fileSystemObjects.iterator();
- while (i.hasNext()) {
- File f = (File) i.next();
- List singleItemList = new ArrayList();
- singleItemList.add(f);
- String textToSet = getPackageName(f);
- if (textToSet != null) {
- File newSource = new File(textToSet);
- executeImportOperation(new ImportOperation(getContainerFullPath(), newSource, FileSystemStructureProvider.INSTANCE, this, singleItemList));
- } else {
- executeImportOperation(new ImportOperation(getContainerFullPath(), getSourceDirectory(), FileSystemStructureProvider.INSTANCE, this, singleItemList));
-
- }
- }
- return true;
-
- }
-
- protected String getPackageName(File f) {
- if (ImportUtil.getExtension(f).equals("class")) { //$NON-NLS-1$
- String fileName = f.getAbsolutePath();
- //get com.ibm.abc.ClassName
- PackageNameResolver nameResolver = new PackageNameResolver();
- String qualifiedClassName = nameResolver.getClassName(fileName);
- if (qualifiedClassName != null) {
-
- //get com
- int index = qualifiedClassName.indexOf('.');
- if (index == -1) {
- return fileName.substring(0, 1 + fileName.lastIndexOf(File.separatorChar));
- }
- String baseDir = qualifiedClassName.substring(0, index);
-
- //get com.ibm.abc
- index = qualifiedClassName.lastIndexOf('.');
- String packageName = qualifiedClassName.substring(0, index);
-
- //get com/ibm/abc
- packageDirStruc = packageName.replace('.', File.separatorChar);
-
- //get C:\com
- index = fileName.indexOf(baseDir);
- //if packageDirStuc exists then set the sourceDir to com, else
- //set the directory to the parent directory of the class
- if (fileName.indexOf(packageDirStruc) != -1) {
- int baseDirLength = baseDir.length();
- String textToSet = fileName.substring(0, index + baseDirLength);
- index = packageName.indexOf('.');
- if (index == -1)
- packageBaseDirName = packageName;
- else
- packageBaseDirName = packageName.substring(0, index);
-
- f = new File(textToSet);
- if (f.getParent() != null)
- f = new File(f.getParent());
- textToSet = f.getAbsolutePath(); //want to set the root directory to com's
- // parent
- //sourceNameField.setText(textToSet);
- return textToSet;
- }
- }
- }
- return null;
- }
-
- /**
- * Initializes the specified operation appropriately.
- */
- protected void initializeOperation(ImportOperation op) {
-
- /*
- * op.setCreateContainerStructure( createContainerStructureButton.getSelection());
- */
- op.setOverwriteResources(overwriteExistingResourcesCheckbox.getSelection());
- }
-
- /**
- * Returns whether the extension provided is an extension that has been specified for export by
- * the user.
- *
- * @param extension
- * the resource name
- * @return <code>true</code> if the resource name is suitable for export based upon its
- * extension
- */
- protected boolean isExportableExtension(String extension) {
- if (selectedTypes == null) // ie.- all extensions are acceptable
- return true;
-
- Iterator aenum = selectedTypes.iterator();
- while (aenum.hasNext()) {
- if (extension.equalsIgnoreCase((String) aenum.next()))
- return true;
- }
-
- return false;
- }
-
- /**
- * Repopulate the view based on the currently entered directory.
- */
- protected void resetSelection() {
-
- MinimizedFileSystemElement currentRoot = getFileSystemTree();
- this.selectionGroup.setRoot(currentRoot);
- if (dragAndDropFileNames != null) {
-
- if (dragAndDropFileNames.get(0).toString().endsWith(".zip") == false && dragAndDropFileNames.get(0).toString().endsWith(".jar") == false) { //$NON-NLS-1$ //$NON-NLS-2$
- this.selectionGroup.expandAll();
- }
-
- MinimizedFileSystemElement temp = (MinimizedFileSystemElement) currentRoot.getFolders().getChildren()[0];
-
- List dirList = pathToArray();
-
- for (int i = 0; i < dirList.size(); i++) {
- String s = (String) dirList.get(i);
- Object[] folders = temp.getFolders().getChildren();
- for (int k = 0; k < folders.length; k++) {
- if (((File) ((MinimizedFileSystemElement) folders[k]).getFileSystemObject()).getName().equals(s)) {
- temp = (MinimizedFileSystemElement) temp.getFolders().getChildren()[k];
- break;
- }
- }
-
- }
-
- if (dragAndDropFileNames.get(0).toString().endsWith(".zip") == false && dragAndDropFileNames.get(0).toString().endsWith(".jar") == false) { //$NON-NLS-1$ //$NON-NLS-2$
- this.selectionGroup.initialCheckTreeItem(temp);
- }
-
- //If can figure out how to pre-highlight dir, then use following code
- //to check dragged files only. Also need to show all files in tree.
- /*
- * String fileName = null; MinimizedFileSystemElement name = null; int numFiles =
- * temp.getFiles().getChildren().length; Object[] files = temp.getFiles().getChildren();
- * for(int i = 0; i < dragAndDropFileNames.size(); i++) { fileName = (new
- * File((String)dragAndDropFileNames.get(i))).getName(); for(int k = 0; k < numFiles;
- * k++) { if(fileName.equals(((File) ((MinimizedFileSystemElement)
- * files[0]).getFileSystemObject()).getName())) {
- * this.selectionGroup.initialCheckTreeItem(temp); break; } } }
- */
-
- //this.selectionGroup.setAllSelections(true);
- }
- }
-
- private List pathToArray() {
- String s = (String) dragAndDropFileNames.get(0);
-
- PackageNameResolver nameResolver = new PackageNameResolver();
- String qualifiedClassName = nameResolver.getClassName(s);
-
- int slashCounts = 0;
- if (qualifiedClassName != null) {
- int index = qualifiedClassName.indexOf('.');
- if (index == -1) {
- return Collections.EMPTY_LIST;
- }
- String baseDir = qualifiedClassName.substring(0, index);
- for (int i = s.indexOf(baseDir); i < s.lastIndexOf(File.separatorChar); i++) {
- if (s.charAt(i) == File.separatorChar)
- slashCounts++;
- }
- }
-
- List dirNamesArray = new ArrayList(slashCounts);
- if (s.endsWith(".zip") || s.endsWith(".jar")) { //$NON-NLS-1$ //$NON-NLS-2$
- return dirNamesArray;
- }
- int startIndex = 0;
- int endIndex;
- for (int i = 0; i <= slashCounts; i++) {
- endIndex = qualifiedClassName.indexOf('.', startIndex);
- dirNamesArray.add(qualifiedClassName.substring(startIndex, endIndex));
- startIndex = endIndex + 1;
- }
- return dirNamesArray;
- }
-
- /**
- * Use the dialog store to restore widget values to the values that they held last time this
- * wizard was used to completion
- */
- protected void restoreWidgetValues() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String[] sourceNames = settings.getArray(STORE_SOURCE_NAMES_ID);
- if (sourceNames == null)
- return; // ie.- no values stored, so stop
-
- // set filenames history
- for (int i = 0; i < sourceNames.length; i++)
- sourceNameField.add(sourceNames[i]);
- }
- }
-
- /**
- * Since Finish was pressed, write widget values to the dialog store so that they will persist
- * into the next invocation of this wizard page
- */
- protected void saveWidgetValues() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- // update source names history
- String[] sourceNames = settings.getArray(STORE_SOURCE_NAMES_ID);
- if (sourceNames == null)
- sourceNames = new String[0];
-
- sourceNames = addToHistory(sourceNames, getSourceDirectoryName());
- settings.put(STORE_SOURCE_NAMES_ID, sourceNames);
-
- }
- }
-
- /**
- * Invokes a file selection operation using the specified file system and structure provider. If
- * the user specifies files to be imported then this selection is cached for later retrieval and
- * is returned.
- */
- protected MinimizedFileSystemElement selectFiles(final Object rootFileSystemObject, final IImportStructureProvider structureProvider) {
-
- final MinimizedFileSystemElement[] results = new MinimizedFileSystemElement[1];
-
- BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
- public void run() {
- //Create the root element from the supplied file system object
- results[0] = createRootElement(rootFileSystemObject, structureProvider);
- }
- });
-
- return results[0];
- }
-
- /**
- * Set all of the selections in the selection group to value. Implemented here to provide access
- * for inner classes.
- *
- * @param value
- * boolean
- */
- protected void setAllSelections(boolean value) {
- super.setAllSelections(value);
- }
-
- /**
- * Sets the source name of the import to be the supplied path. Adds the name of the path to the
- * list of items in the source combo and selects it.
- *
- * @param path
- * the path to be added
- */
- protected void setSourceName(String path) {
-
- if (path.length() > 0) {
-
- String[] currentItems = this.sourceNameField.getItems();
- int selectionIndex = -1;
- for (int i = 0; i < currentItems.length; i++) {
- if (currentItems[i].equals(path))
- selectionIndex = i;
- }
- if (selectionIndex < 0) {
- int oldLength = currentItems.length;
- String[] newItems = new String[oldLength + 1];
- System.arraycopy(currentItems, 0, newItems, 0, oldLength);
- newItems[oldLength] = path;
- this.sourceNameField.setItems(newItems);
- selectionIndex = oldLength;
- }
- this.sourceNameField.select(selectionIndex);
-
- resetSelection();
- }
- }
-
- /**
- * Update the tree to only select those elements that match the selected types
- */
- protected void setupSelectionsBasedOnSelectedTypes() {
- ProgressMonitorDialog dialog = new ProgressMonitorDialog(getContainer().getShell());
- final Map selectionMap = new Hashtable();
-
- final IElementFilter filter = new IElementFilter() {
-
- public void filterElements(Collection files, IProgressMonitor monitor) throws InterruptedException {
- if (files == null) {
- throw new InterruptedException();
- }
- Iterator filesList = files.iterator();
- while (filesList.hasNext()) {
- if (monitor.isCanceled())
- throw new InterruptedException();
- checkFile(filesList.next());
- }
- }
-
- public void filterElements(Object[] files, IProgressMonitor monitor) throws InterruptedException {
- if (files == null) {
- throw new InterruptedException();
- }
- for (int i = 0; i < files.length; i++) {
- if (monitor.isCanceled())
- throw new InterruptedException();
- checkFile(files[i]);
- }
- }
-
- private void checkFile(Object fileElement) {
- MinimizedFileSystemElement file = (MinimizedFileSystemElement) fileElement;
- if (isExportableExtension(file.getFileNameExtension())) {
- List elements = new ArrayList();
- FileSystemElement parent = file.getParent();
- if (selectionMap.containsKey(parent))
- elements = (List) selectionMap.get(parent);
- elements.add(file);
- selectionMap.put(parent, elements);
- }
- }
-
- };
-
- IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(final IProgressMonitor monitor) throws InterruptedException {
- monitor.beginTask("ImportPage.filterSelections", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
- getSelectedResources(filter, monitor);
- }
- };
-
- try {
- dialog.run(true, true, runnable);
- } catch (InvocationTargetException exception) {
- //Couldn't start. Do nothing.
- return;
- } catch (InterruptedException exception) {
- //Got interrupted. Do nothing.
- return;
- }
- // make sure that all paint operations caused by closing the progress
- // dialog get flushed, otherwise extra pixels will remain on the screen until
- // updateSelections is completed
- getShell().update();
- // The updateSelections method accesses SWT widgets so cannot be executed
- // as part of the above progress dialog operation since the operation forks
- // a new process.
- if (selectionMap != null) {
- updateSelections(selectionMap);
- }
- }
-
- /*
- * (non-Javadoc) Method declared on IDialogPage. Set the selection up when it becomes visible.
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- resetSelection();
- if (visible)
- this.sourceNameField.setFocus();
- }
-
- /**
- * Update the selections with those in map . Implemented here to give inner class visibility
- *
- * @param map
- * Map - key tree elements, values Lists of list elements
- */
- protected void updateSelections(Map map) {
- super.updateSelections(map);
- }
-
- /**
- * Check if widgets are enabled or disabled by a change in the dialog. Provided here to give
- * access to inner classes.
- *
- * @param event
- * Event
- */
- protected void updateWidgetEnablements() {
-
- super.updateWidgetEnablements();
- }
-
- /**
- * Answer a boolean indicating whether self's source specification widgets currently all contain
- * valid values.
- */
- protected boolean validateSourceGroup() {
- if (getSourceDirectory() != null) {
- File sourceDirectory = getSourceDirectory();
- if (sourceDirectory == null) {
- setMessage(SOURCE_EMPTY_MESSAGE);
- enableButtonGroup(false);
- return false;
- }
-
- if (sourceConflictsWithDestination(new Path(sourceDirectory.getPath()))) {
- setErrorMessage(getSourceConflictMessage()); //$NON-NLS-1$
- enableButtonGroup(false);
- return false;
- }
-
- enableButtonGroup(true);
- return true;
- }
- //If there is nothing being provided to the input then there is a problem
- if (this.currentProvider == null) {
- setMessage(SOURCE_EMPTY_MESSAGE);
- enableButtonGroup(false);
- return false;
- }
- enableButtonGroup(true);
- return true;
- }
-
- /**
- * Returns whether the source location conflicts with the destination resource. This will occur
- * if the source is already under the destination.
- *
- * @param sourcePath
- * the path to check
- * @return <code>true</code> if there is a conflict, <code>false</code> if not
- */
- protected boolean sourceConflictsWithDestination(IPath sourcePath) {
-
- IContainer container = getSpecifiedContainer();
- if (container == null)
- return false;
- return getSpecifiedContainer().getLocation().isPrefixOf(sourcePath);
- }
-
- protected IPath getResourcePath() {
- return importedClassesPath;
- }
-
- //-------------------------------------------------------------------------------------
-
- //makesure to call mainpage.cancel()
- public boolean cancel() {
- clearProviderCache();
- return true;
- }
-
- /**
- * Clears the cached structure provider after first finalizing it properly.
- */
- protected void clearProviderCache() {
- if (providerCache != null) {
- closeZipFile(providerCache.getZipFile());
- providerCache = null;
- }
- }
-
- /**
- * Attempts to close the passed zip file, and answers a boolean indicating success.
- */
- protected boolean closeZipFile(ZipFile file) {
- try {
- file.close();
- } catch (IOException e) {
- //displayErrorDialog(DataTransferMessages.format("ZipImport.couldNotClose", new
- // Object[] { file.getName()})); //$NON-NLS-1$
- return false;
- }
-
- return true;
- }
-
- /**
- * Answer a handle to the zip file currently specified as being the source. Return null if this
- * file does not exist or is not of valid format.
- */
-
- protected ZipFile getSpecifiedSourceFile() {
- return getSpecifiedSourceFile(sourceNameField.getText());
- }
-
- /**
- * Answer a handle to the zip file currently specified as being the source. Return null if this
- * file does not exist or is not of valid format.
- */
-
- private ZipFile getSpecifiedSourceFile(String fileName) {
- if (fileName.length() == 0)
- return null;
-
- try {
- return new ZipFile(fileName);
- } catch (ZipException e) {
- //displayErrorDialog(DataTransferMessages.getString("ZipImport.badFormat"));
- // //$NON-NLS-1$
- } catch (IOException e) {
- //displayErrorDialog(DataTransferMessages.getString("ZipImport.couldNotRead"));
- // //$NON-NLS-1$
- }
-
- sourceNameField.setFocus();
- return null;
- }
-
- /**
- * Returns a structure provider for the specified zip file.
- */
- protected ZipFileStructureProvider getStructureProvider(ZipFile targetZip) {
- if (providerCache == null)
- providerCache = new ZipFileStructureProvider(targetZip);
- else if (!providerCache.getZipFile().getName().equals(targetZip.getName())) {
- clearProviderCache(); // ie.- new value, so finalize&remove old value
- providerCache = new ZipFileStructureProvider(targetZip);
- } else if (!providerCache.getZipFile().equals(targetZip))
- closeZipFile(targetZip); // ie.- duplicate handle to same .zip
-
- return providerCache;
- }
-
- /**
- * Open a FileDialog so that the user can specify the source file to import from
- */
- protected void handleSourceBrowseButtonPressedForZip() {
- String selectedFile = queryZipFileToImport();
- if (selectedFile != null) {
- if (!selectedFile.equals(sourceNameField.getText())) {
- //Be sure it is valid before we go setting any names
- ZipFile sourceFile = getSpecifiedSourceFile(selectedFile);
- if (sourceFile != null) {
- closeZipFile(sourceFile);
- setSourceName(selectedFile);
- selectionGroup.setFocus();
- }
- }
- }
- }
-
- /**
- * Import the resources with extensions as specified by the user
- */
- protected boolean importResourcesFromZip(List fileSystemObjects) {
-
- ZipFile zipFile = getSpecifiedSourceFile();
- ZipFileStructureProvider structureProvider = getStructureProvider(zipFile);
-
- boolean result = executeImportOperation(new ImportOperation(getContainerFullPath(), structureProvider.getRoot(), structureProvider, this, fileSystemObjects));
-
- closeZipFile(zipFile);
-
- return result;
- }
-
- /**
- * Opens a file selection dialog and returns a string representing the selected file, or
- * <code>null</code> if the dialog was canceled.
- */
- protected String queryZipFileToImport() {
- FileDialog dialog = new FileDialog(sourceNameField.getShell(), SWT.OPEN);
- dialog.setFilterExtensions(new String[]{FILE_IMPORT_MASK});
-
- String currentSourceString = sourceNameField.getText();
- int lastSeparatorIndex = currentSourceString.lastIndexOf(File.separator);
- if (lastSeparatorIndex != -1)
- dialog.setFilterPath(currentSourceString.substring(0, lastSeparatorIndex));
-
- return dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java
deleted file mode 100644
index 9f298cc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java
+++ /dev/null
@@ -1,350 +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.jst.j2ee.ui.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJ2EEComponentsContentProvider;
-import org.eclipse.jst.j2ee.internal.wizard.DefaultJ2EEComponentCreationWizard;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentLabelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetInstallPage extends DataModelFacetInstallPage implements IEarFacetInstallDataModelProperties {
-
- private Button selectAllButton;
- private Button deselectAllButton;
- private Button newModuleButton;
- private CheckboxTableViewer moduleProjectsViewer;
- private boolean ignoreCheckedState = false;
-
-
- private Label contentDirLabel;
- private Text contentDir;
-
- public EarFacetInstallPage() {
- super("ear.facet.install.page"); //$NON-NLS-1$
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{CONTENT_DIR, J2EE_PROJECTS_LIST};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite modulesGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- modulesGroup.setLayout(layout);
- setInfopopID(IJ2EEUIContextIds.NEW_EAR_ADD_MODULES_PAGE);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- modulesGroup.setLayoutData(gridData);
- createModuleProjectOptions(modulesGroup);
- createButtonsGroup(modulesGroup);
-
- final Composite composite = new Composite(modulesGroup, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- this.contentDirLabel = new Label(composite, SWT.NONE);
- this.contentDirLabel.setText(Resources.contentDirLabel);
- this.contentDirLabel.setLayoutData(gdhfill());
-
- this.contentDir = new Text(composite, SWT.BORDER);
- this.contentDir.setLayoutData(gdhfill());
- synchHelper.synchText(contentDir, CONTENT_DIR, null);
-
- return modulesGroup;
- }
-
- protected int getJ2EEVersion() {
- IProjectFacetVersion version = (IProjectFacetVersion)getDataModel().getProperty(FACET_VERSION);
- return J2EEVersionUtil.convertVersionStringToInt(version.getVersionString());
- }
-
- /**
- * @param modulesGroup
- */
- private void createModuleProjectOptions(Composite modulesGroup) {
- moduleProjectsViewer = CheckboxTableViewer.newCheckList(modulesGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.widthHint = 200;
- gData.heightHint = 80;
- moduleProjectsViewer.getControl().setLayoutData(gData);
- int j2eeVersion = getJ2EEVersion();
- AvailableJ2EEComponentsContentProvider provider = new AvailableJ2EEComponentsContentProvider(j2eeVersion);
- moduleProjectsViewer.setContentProvider(provider);
- moduleProjectsViewer.setLabelProvider(new J2EEComponentLabelProvider());
- setCheckedItemsFromModel();
-
- moduleProjectsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- if (!ignoreCheckedState) {
- getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
- }
- }
- });
- TableLayout tableLayout = new TableLayout();
- moduleProjectsViewer.getTable().setLayout(tableLayout);
- moduleProjectsViewer.getTable().setHeaderVisible(false);
- moduleProjectsViewer.getTable().setLinesVisible(false);
- moduleProjectsViewer.setSorter(null);
- }
-
- /**
- *
- */
- private void setCheckedItemsFromModel() {
- List components = (List) getDataModel().getProperty(J2EE_PROJECTS_LIST);
- moduleProjectsViewer.setCheckedElements(components.toArray());
- }
-
- private void refreshModules() {
- moduleProjectsViewer.refresh();
- setCheckedItemsFromModel();
- }
-
- protected List getCheckedJ2EEElementsAsList() {
- Object[] elements = moduleProjectsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else{
- list = new ArrayList();
- for( int i=0; i< elements.length; i++){
- if( elements[i] instanceof IProject ) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
- protected List getCheckedJavaProjectsAsList() {
- Object[] elements = moduleProjectsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else{
- list = new ArrayList();
- for( int i=0; i< elements.length; i++){
- if( elements[i] instanceof IProject ) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_SELECT));
- selectAllButton.addListener(SWT.Selection, this);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.widthHint = 120;
- selectAllButton.setLayoutData(gd);
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_DESELECT));
- deselectAllButton.addListener(SWT.Selection, this);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.widthHint = 120;
- deselectAllButton.setLayoutData(gd);
- newModuleButton = new Button(buttonGroup, SWT.PUSH);
- newModuleButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_NEW));
- newModuleButton.addListener(SWT.Selection, this);
- gd = new GridData(GridData.GRAB_HORIZONTAL);
- gd.minimumWidth = 120;
- newModuleButton.setLayoutData(gd);
- }
-
- /**
- * @see org.eclipse.swt.widgets.Listener#handleEvent(Event)
- */
- public void handleEvent(Event evt) {
- if (evt.widget == selectAllButton)
- handleSelectAllButtonPressed();
- else if (evt.widget == deselectAllButton)
- handleDeselectAllButtonPressed();
- else if (evt.widget == newModuleButton)
- handleNewModuleButtonPressed();
- else
- super.handleEvent(evt);
- }
-
- /**
- *
- */
- private void handleNewModuleButtonPressed() {
- IDataModel aModel = createNewModuleModel();
- DefaultJ2EEComponentCreationWizard wizard = new DefaultJ2EEComponentCreationWizard(aModel);
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- dialog.create();
- if (dialog.open() != IDialogConstants.CANCEL_ID) {
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- moduleProjectsViewer.setInput(input);
- setNewModules(aModel);
- refreshModules();
- }
- }
- /**
- * @param model
- */
- private void setNewModules(IDataModel defaultModel) {
- List newComponents = new ArrayList();
- collectNewComponents(defaultModel, newComponents);
- List oldComponents = (List) getDataModel().getProperty(J2EE_PROJECTS_LIST);
- newComponents.addAll(oldComponents);
- getDataModel().setProperty(J2EE_PROJECTS_LIST, newComponents);
- }
-
- private void collectNewComponents(IDataModel defaultModel, List newProjects) {
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_EJB), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_WEB), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_CLIENT), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_JCA), newProjects);
- }
- private void collectComponents(IDataModel compDM, List newProjects) {
- if (compDM != null) {
- String projectName = compDM.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- if(projectName == null) return;
- IProject project = ProjectUtilities.getProject(projectName);
- if (project != null && project.exists())
- newProjects.add(project);
- }
- }
-
- private IDataModel createNewModuleModel() {
- IDataModel defaultModel = DataModelFactory.createDataModel(new DefaultJ2EEComponentCreationDataModelProvider());
- // transfer properties, project name
- String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.PROJECT_NAME, projectName);
- // ear component name
- String earName = model.getStringProperty(FACET_PROJECT_NAME);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earName);
- // ear j2ee version
- int j2eeVersion = getJ2EEVersion();
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.J2EE_VERSION, new Integer(j2eeVersion));
-
- IRuntime rt = (IRuntime) model.getProperty(FACET_RUNTIME);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.FACET_RUNTIME, rt);
-
- return defaultModel;
- }
-
- /**
- *
- */
- private void handleDeselectAllButtonPressed() {
- ignoreCheckedState = true;
- try {
- moduleProjectsViewer.setAllChecked(false);
- //getDataModel().setProperty(J2EE_COMPONENT_LIST, null);
- //IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- //(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(J2EE_PROJECTS_LIST, null);
- getDataModel().setProperty(JAVA_PROJECT_LIST, null);
- } finally {
- ignoreCheckedState = false;
- }
- }
-
- /**
- *
- */
- private void handleSelectAllButtonPressed() {
- ignoreCheckedState = true;
- try {
- moduleProjectsViewer.setAllChecked(true);
- //getDataModel().setProperty(J2EE_COMPONENT_LIST, getCheckedElementsAsList());
- //IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- //(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
-
- getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
-
- } finally {
- ignoreCheckedState = false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#enter()
- */
- protected void enter() {
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- moduleProjectsViewer.setInput(input);
- super.enter();
- }
-
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String pageTitle;
- public static String pageDescription;
- public static String contentDirLabel;
- public static String contentDirLabelInvalid;
-
- static {
- initializeMessages(EarFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties
deleted file mode 100644
index 4cd1fce..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pageTitle = EAR Module
-pageDescription = Configure EAR module settings.
-contentDirLabel = Content Directory:
-contentDirLabelInvalid = Content Directory (invalid):
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java
deleted file mode 100644
index 6ab2da0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java
+++ /dev/null
@@ -1,35 +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.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public class EarProjectFirstPage extends DataModelFacetCreationWizardPage {
-
- public EarProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- setInfopopID(IJ2EEUIContextIds.NEW_EAR_WIZARD_P1);
- }
-
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java
deleted file mode 100644
index 13a0ef4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java
+++ /dev/null
@@ -1,62 +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.jst.j2ee.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-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.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class EarProjectWizard extends NewProjectDataModelFacetWizard {
-
- public EarProjectWizard(IDataModel model){
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_WIZ_TITLE));
- }
-
- public EarProjectWizard(){
- super();
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_WIZ_TITLE));
- }
-
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
- }
-
- public void setRuntimeInDataModel(IRuntime runtime){
- model.setProperty(FACET_RUNTIME, runtime);
- }
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.j2ee.ui");
- final URL url = bundle.getEntry("icons/ear-wiz-banner.gif");
-
- return ImageDescriptor.createFromURL(url);
- }
-
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.ear");
- }
-
- protected IWizardPage createFirstPage() {
- return new EarProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java
deleted file mode 100644
index fdff970..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java
+++ /dev/null
@@ -1,136 +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.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-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.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.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarSelectionPanel implements IWebFacetInstallDataModelProperties
-
-{
- private final Button addToEar;
- private final Combo combo;
- private final Button newButton;
- private final Label label;
-
- private final IDataModel model;
- private DataModelSynchHelper synchhelper;
-
-
-
- public EarSelectionPanel( final IDataModel model, final Composite parent)
- {
- this.model = model;
- this.synchhelper = new DataModelSynchHelper(model);
-
- this.addToEar = new Button( parent, SWT.CHECK );
- this.addToEar.setText( Resources.addToEarLabel );
- this.addToEar.setLayoutData( gdhspan( gdhfill(), 3 ) );
- synchhelper.synchCheckbox(addToEar, ADD_TO_EAR, null);
-
- label = new Label(parent, SWT.NULL);
- label.setText(Resources.earProjectLabel);
- GridData gridData = new GridData();
- gridData.horizontalIndent = 20;
- label.setLayoutData(gridData);
- this.combo = new Combo(parent, SWT.NONE);
- this.combo.setLayoutData( gdhfill() );
-
- this.newButton = new Button( parent, SWT.PUSH );
- this.newButton.setText( Resources.newButtonLabel );
-
- this.newButton.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( final SelectionEvent event )
- {
- handleAddButton();
- }
- } );
-
- synchhelper.synchCombo(combo, EAR_PROJECT_NAME, new Control[]{label, newButton});
-
- }
-
- private void handleAddButton()
- {
- final EarProjectWizard wizard = new EarProjectWizard();
-
- final WizardDialog dialog
- = new WizardDialog( newButton.getShell(), wizard );
-
- IRuntime runtime = (IRuntime)model.getProperty(FACET_RUNTIME);
- wizard.setRuntimeInDataModel(runtime);
- if( dialog.open() != SWT.CANCEL )
- {
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- final String earproj = wizard.getProjectName();
- model.setProperty(EAR_PROJECT_NAME, earproj);
- }
- }
-
- private static GridData gdhfill()
- {
- return new GridData( GridData.FILL_HORIZONTAL );
- }
-
- public static final GridData gdhspan( final GridData gd,
- final int span )
- {
- gd.horizontalSpan = span;
- return gd;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String addToEarLabel;
- public static String newButtonLabel;
- public static String earProjectLabel;
-
- static
- {
- initializeMessages( EarSelectionPanel.class.getName(),
- Resources.class );
- }
- }
-
- public void dispose() {
- if(synchhelper != null){
- synchhelper.dispose();
- synchhelper = null;
- }
- }
-
- public String getComboText(){
- return combo.getText();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties
deleted file mode 100644
index 0d6810e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-addToEarLabel = Add project to an EAR
-newButtonLabel = New...
-earProjectLabel=EAR Project Name:
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.java
deleted file mode 100644
index c6ad806..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.java
+++ /dev/null
@@ -1,164 +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.jst.j2ee.ui.project.facet;
-
-import java.util.Collections;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.common.project.facet.JavaFacetValidator;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-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.IFacetedProject.Action;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaVersionMismatchMarkerResolutions
-
- implements IMarkerResolutionGenerator
-
-{
- public IMarkerResolution[] getResolutions( final IMarker marker )
- {
- return new IMarkerResolution[]
- {
- new Resolution1( marker ),
- new Resolution2( marker )
- };
- }
-
- private static final class Resolution1
-
- implements IMarkerResolution
-
- {
- private final IMarker marker;
-
- public Resolution1( final IMarker marker )
- {
- this.marker = marker;
- }
-
- public String getLabel()
- {
- final IProjectFacetVersion fv = getProjectFacetVersion();
- return NLS.bind( Resources.changeFacetVersion, fv );
- }
-
- public void run( final IMarker marker )
- {
- final Action action
- = new Action( Action.Type.VERSION_CHANGE,
- getProjectFacetVersion(), null );
-
- final IProject proj = this.marker.getResource().getProject();
-
- try
- {
- final IFacetedProject fproj
- = ProjectFacetsManager.create( proj );
-
- fproj.modify( Collections.singleton( action ), null );
- }
- catch( CoreException e )
- {
- ErrorDialog.openError( null, Resources.errorDialogTitle,
- Resources.errorDialogMessage,
- e.getStatus() );
- }
- }
-
- private IProjectFacetVersion getProjectFacetVersion()
- {
- final String level
- = this.marker.getAttribute( JavaFacetValidator.ATTR_COMPILER_LEVEL, null );
-
- return JavaFacetUtils.compilerLevelToFacet( level );
- }
- }
-
- private static final class Resolution2
-
- implements IMarkerResolution
-
- {
- private final IMarker marker;
-
- public Resolution2( final IMarker marker )
- {
- this.marker = marker;
- }
-
- public String getLabel()
- {
- final String level = getCompilerLevel();
- return NLS.bind( Resources.changeCompilerLevel, level );
- }
-
- public void run( final IMarker marker )
- {
- final IProject project = this.marker.getResource().getProject();
- final String level = getCompilerLevel();
-
- try
- {
- JavaFacetUtils.setCompilerLevel( project, level );
- JavaFacetUtils.scheduleFullBuild( project );
- }
- catch( CoreException e )
- {
- ErrorDialog.openError( null, Resources.errorDialogTitle,
- Resources.errorDialogMessage,
- e.getStatus() );
- }
- }
-
- private String getCompilerLevel()
- {
- final String fvstr
- = this.marker.getAttribute( JavaFacetValidator.ATTR_FACET_VERSION, null);
-
- final IProjectFacetVersion fv
- = JavaFacetUtils.JAVA_FACET.getVersion( fvstr );
-
- return JavaFacetUtils.facetToCompilerLevel( fv );
- }
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String changeFacetVersion;
- public static String changeCompilerLevel;
- public static String errorDialogTitle;
- public static String errorDialogMessage;
-
- static
- {
- initializeMessages( JavaVersionMismatchMarkerResolutions.class.getName(),
- Resources.class );
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.properties
deleted file mode 100644
index 227ca0a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-changeFacetVersion = Change Java project facet version to {0}
-changeCompilerLevel =Change Java compiler level to {0}
-errorDialogTitle = Error
-errorDialogMessage = Failed while applying the quick fix.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java
deleted file mode 100644
index 80b94a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java
+++ /dev/null
@@ -1,122 +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.jst.j2ee.ui.project.facet;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class RuntimeMismatchMarkerResolutions
-
- implements IMarkerResolutionGenerator
-
-{
- public IMarkerResolution[] getResolutions( final IMarker marker )
- {
- return new IMarkerResolution[]
- {
- new Resolution( marker, marker.getAttribute( "runtime1", null ) ),
- new Resolution( marker, marker.getAttribute( "runtime2", null ) )
- };
- }
-
- private static final class Resolution
-
- implements IMarkerResolution
-
- {
- private final IMarker marker;
- private final String runtimeName;
-
- public Resolution( final IMarker marker,
- final String runtimeName )
- {
- this.marker = marker;
- this.runtimeName = runtimeName;
- }
-
- public String getLabel()
- {
- return NLS.bind( Resources.useSameRuntime, this.runtimeName );
- }
-
- public void run( final IMarker marker )
- {
- final IRuntime runtime
- = RuntimeManager.getRuntime( this.runtimeName );
-
- try
- {
- setRuntime( this.marker.getResource().getProject(), runtime );
-
- final String pjname
- = this.marker.getAttribute( "moduleProject", null );
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IProject pj = ws.getRoot().getProject( pjname );
-
- setRuntime( pj, runtime );
- }
- catch( CoreException e )
- {
- ErrorDialog.openError( null, Resources.errorDialogTitle,
- Resources.errorDialogMessage,
- e.getStatus() );
- }
- }
-
- private void setRuntime( final IProject proj,
- final IRuntime runtime )
-
- throws CoreException
-
- {
- final IFacetedProject fproj = ProjectFacetsManager.create( proj );
-
- if( ! fproj.getRuntime().equals( runtime ) )
- {
- fproj.setRuntime( runtime, null );
- }
- }
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String useSameRuntime;
- public static String errorDialogTitle;
- public static String errorDialogMessage;
-
- static
- {
- initializeMessages( RuntimeMismatchMarkerResolutions.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties
deleted file mode 100644
index d386a84..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-useSameRuntime = Swith both projects to {0}
-errorDialogTitle = Error
-errorDialogMessage = Failed while applying the quick fix.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.java
deleted file mode 100644
index 4aefc0f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.java
+++ /dev/null
@@ -1,51 +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.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public final class UtilityFacetInstallPage extends J2EEModuleFacetInstallPage {
- public UtilityFacetInstallPage() {
- super("utility.facet.install.page");
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
-
- static {
- initializeMessages(UtilityFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
- setInfopopID(IJ2EEUIContextIds.NEW_UTILITY_WIZARD_P3);
- //setupEarControl(composite);
- return composite;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.properties
deleted file mode 100644
index 0a6de07..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pageTitle = Utility Module
-pageDescription = Configure utility module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java
deleted file mode 100644
index e8d39d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java
+++ /dev/null
@@ -1,41 +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.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class UtilityProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public UtilityProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- setInfopopID(IJ2EEUIContextIds.NEW_UTILITY_WIZARD_P1);
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
-
- static {
- initializeMessages(UtilityFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.UTILITY;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java
deleted file mode 100644
index 494ad6c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java
+++ /dev/null
@@ -1,62 +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.jst.j2ee.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-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.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class UtilityProjectWizard extends NewProjectDataModelFacetWizard {
-
- public UtilityProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVAUTIL_COMPONENT_WIZ_TITLE));
- }
-
- public UtilityProjectWizard(){
- super();
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVAUTIL_COMPONENT_WIZ_TITLE));
- }
-
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
- }
-
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.j2ee.ui");
- final URL url = bundle.getEntry("icons/util-wiz-banner.gif");
- return ImageDescriptor.createFromURL(url);
- }
-
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.utility");
- }
-
- protected IWizardPage createFirstPage() {
- return new UtilityProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java
deleted file mode 100644
index 0fd7e68..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.ui.project.facet.appclient;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class AppClientFacetInstallPage extends J2EEModuleFacetInstallPage implements IAppClientFacetInstallDataModelProperties {
-
- private Label configFolderLabel;
- private Text configFolder;
- private Button createMainClass;
-
- public AppClientFacetInstallPage() {
- super("appclient.facet.install.page"); //$NON-NLS-1$
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_SETTINGS));
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME, CONFIG_FOLDER, CREATE_DEFAULT_MAIN_CLASS};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.NEW_APPCLIENT_WIZARD_P3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- //setupEarControl(composite);
-
- configFolderLabel = new Label(composite, SWT.NONE);
- configFolderLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.SOURCEFOLDER));
- configFolderLabel.setLayoutData(gdhfill());
-
- configFolder = new Text(composite, SWT.BORDER);
- configFolder.setLayoutData(gdhfill());
- configFolder.setData("label", configFolderLabel); //$NON-NLS-1$
- synchHelper.synchText(configFolder, CONFIG_FOLDER, null);
-
- createMainClass = new Button(composite, SWT.CHECK);
- createMainClass.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_CREATE_MAIN));
- synchHelper.synchCheckbox(createMainClass, CREATE_DEFAULT_MAIN_CLASS, null);
-
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
deleted file mode 100644
index f57edd7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.ui.project.facet.appclient;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public AppClientProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_PROJECT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.NEW_APPCLIENT_WIZARD_P1);
- }
-
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.APPLICATION_CLIENT;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java
deleted file mode 100644
index 86eab40..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.ui.project.facet.appclient;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-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.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class AppClientProjectWizard extends NewProjectDataModelFacetWizard {
-
- public AppClientProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_WIZ_TITLE));
- }
-
- public AppClientProjectWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_WIZ_TITLE));
- }
-
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- }
-
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle(J2EEUIPlugin.PLUGIN_ID);
- final URL url = bundle.getEntry("icons/full/wizban/appclient_wiz.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.appclient"); //$NON-NLS-1$
- }
-
- protected IWizardPage createFirstPage() {
- return new AppClientProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml b/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml
deleted file mode 100644
index 633a03e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="javadoc">
- <target name="javadoc">
- <javadoc access="protected" author="false" classpath="../org.eclipse.jst.j2ee.web/bin;../org.eclipse.jst.common.frameworks/bin;../org.eclipse.jst.common.navigator.java/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\core.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.uriresolver_1.0.0\uriresolver.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.edit.ui_2.1.0\runtime\edit.ui.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\wsdl.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.editors_3.1.0\editors.jar;D:\Development\targets\wtp_target\eclipse\plugins\com.ibm.wtp.common.util_1.0.1\util.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore.edit_2.1.0\runtime\ecore.edit.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.xml.uriresolver_1.0.0\xmlcatalog.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.workbench_3.1.0\workbench.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.runtime.compatibility_3.0.0\compatibility.jar;D:\Development\targets\wtp_target\eclipse\plugins\com.ibm.wtp.emf.workbench_1.0.1.1\emfworkbench.jar;../org.eclipse.jst.j2ee.jca.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.edit_2.1.0\runtime\edit.jar;../org.eclipse.wst.common.emfworkbench.integration/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem.workbench_1.0.1.1\workbench.jar;../org.eclipse.wst.validation/bin;../org.eclipse.wst.web/bin;../org.eclipse.jst.ejb.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.core_3.1.0\jdtcore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\osgi.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.common.ui_2.0.1\runtime\common.ui.jar;../org.eclipse.jst.common.annotations.controller/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.codegen_2.1.0\runtime\codegen.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.ide_3.1.0\ide.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.ui_3.1.0\jdt.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem_1.0.1\javainst.jar;../org.eclipse.jst.j2ee.ejb/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\defaultAdaptor.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.swt.win32_3.1.0\ws\win32\swt.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\resolver.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\jars\wsdl4j.jar;../org.eclipse.jst.j2ee.jca/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.xsd_2.1.0\runtime\xsd.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jface.text_3.1.0\jfacetext.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.1.0\texteditor.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.views_3.1.0\views.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.resources_3.1.0\resources.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.contentmodel_1.0.0\contentmodel.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.text_3.1.0\text.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.ws.parser_1.0.0\parser.jar;../org.eclipse.jst.j2ee/bin;../org.eclipse.jst.common.annotations.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\eclipseAdaptor.jar;../org.eclipse.jst.j2ee.core/runtime/j2ee.jar;../org.eclipse.wst.sse.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.filebuffers_3.1.0\filebuffers.jar;../org.eclipse.wst.common.navigator.workbench/bin;../org.eclipse.wst.common.migration/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.webbrowser_1.0.0\webbrowser.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem_1.0.1\mofjava.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.server.core_3.0.0\servercore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.common_2.1.0\runtime\common.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.server.ui_3.0.0\serverui.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.launching_3.1.0\launching.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\jars\qname.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui_3.1.0\ui.jar;../org.eclipse.wst.common.frameworks/bin;../org.eclipse.jst.j2ee.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.codegen.ecore_2.1.0\runtime\codegen.ecore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ltk.core.refactoring_3.1.0\refcore.jar;../org.eclipse.jst.servlet.ui/bin;bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.runtime_3.1.0\runtime.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\console.jar;../org.eclipse.wst.common.emf/bin;../org.eclipse.wst.common.navigator.views/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.update.configurator_3.0.0\configurator.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore.xmi_2.1.0\runtime\ecore.xmi.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jface_3.1.0\jface.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore_2.1.0\runtime\ecore.jar;../org.eclipse.wst.common.frameworks.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jst.server.core_3.0.0\sjavacore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.encoding_1.0.0\encodingresource.jar" destdir="D:\Development\wtp_api_docs" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.jst.j2ee.jca.ui,org.eclipse.jst.servlet.ui,org.eclipse.jst.j2ee.ui,org.eclipse.jst.ejb.ui" sourcepath="j2ee_ui;../org.eclipse.jst.ejb.ui/property_files;../org.eclipse.jst.servlet.ui/property_files;property_files;../org.eclipse.jst.servlet.ui/servlet_ui;../org.eclipse.jst.ejb.ui/ejb_ui;../org.eclipse.jst.j2ee.jca.ui/property_files;../org.eclipse.jst.j2ee.jca.ui/jca_ui" splitindex="true" use="true" version="true"/>
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
deleted file mode 100644
index 5dbe68c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
+++ /dev/null
@@ -1,50 +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
-###############################################################################
-j2ee=J2EE
-client.jar.file_ui_=App Client JAR file
-client.import.description_ui_=Import an external Application Client JAR file into an Application Client project
-client.export.description_ui_=Export an Application Client project into an Application Client JAR file
-ear.file_ui_=EAR file
-ear.import.description_ui_=Import an external EAR file into an Enterprise Application project
-ear.export.description_ui_=Export an Enterprise Application project into an EAR file
-ear.export.action.description_ui_=Export EAR File...
-j2ee.category_ui_=J2EE
-client.project_ui_=Application Client Project
-ear.project_ui_=Enterprise Application Project
-j2ee.actions.description_ui_=Actions for J2EE Development
-create.enterprise.application_ui_=Create an Enterprise Application
-create.client.module_ui_=Create an Application Client project
-client.export.action.label_ui_=Export Application Client JAR...
-jar.dependencies.props_ui_=EAR Dependencies
-ejb.export.action.description_ui_=Export EJB JAR File...
-ejb.client.jar.creation.action.description_ui_=Create EJB Client Jar
-emptyEJBGroupFilter.name=Empty EJB groups
-ejb.export.action.description_ui_=Export EJB JAR File...
-utility_jar_import_wizard=J2EE Utility Jar
-deploy_ui_=Deploy
-Import_Classes=Import Class Files...
-flexible.project_ui_=Flexible Java Project
-new.flexible.project.description_ui_=Create a flexible Java project
-ear_component_ui_=Enterprise Application Project
-new.ear.component.description_ui_=Create a J2EE EAR project
-appclient_component_ui_=Application Client Project
-new.appclient.component.description_ui_=Create a J2EE application client project
-Java_Component=Java Component
-Java_Component.description=Create a Java Component
-addmodulestoear.props_ui_=EAR modules
-J2EEDependenciesPage.name = J2EE Module Dependencies
-weblib.dependencies.props_ui_=Web Libraries
-J2EE_Rename_Participant=J2EE Rename Participant
-new-projects-wizard-category-name = Web Tools (New)
-util-project-wizard-name = Utility Project
-util-project-wizard-description = Create a Utility project
-ear-project-wizard-name = EAR Project
-ear-project-wizard-description = Create an EAR project
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
deleted file mode 100644
index 675b71b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
+++ /dev/null
@@ -1,1002 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!-- ====================================================== -->
-<!-- -->
-<!-- Purpose: Extension for the J2EE ACtion Sets -->
-<!-- Extension point: org.eclipse.ui.actionSets -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%j2ee"
- description="%j2ee.actions.description_ui_"
- visible="false"
- id="org.eclipse.jst.j2ee.J2eeMainActionSet">
- <action
- label="%create.client.module_ui_"
- icon="icons/full/ctool16/newappclient_wiz.gif"
- tooltip="%create.client.module_ui_"
- class="org.eclipse.jst.j2ee.internal.actions.NewAppClientComponentAction"
- toolbarPath="J2EEMain"
- id="org.eclipse.jst.j2ee.internal.actions.NewAppClientComponent">
- </action>
- <action
- label="%create.enterprise.application_ui_"
- icon="icons/full/ctool16/newear_wiz.gif"
- tooltip="%create.enterprise.application_ui_"
- class="org.eclipse.jst.j2ee.internal.actions.NewEARComponentAction"
- toolbarPath="J2EEMain"
- id="org.eclipse.jst.j2ee.internal.actions.NewEARComponent">
- </action>
- </actionSet>
- </extension>
-
-<!--================================-->
-<!-- Project Wizard Contributions -->
-<!--================================-->
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%j2ee.category_ui_"
- id="org.eclipse.jst.j2ee.internal">
- </category>
-<!-- Flexible Project Wizard
- <wizard
- name="%flexible.project_ui_"
- icon="icons/full/ctool16/newear_wiz.gif"
- category="org.eclipse.jdt.ui.java"
- class="org.eclipse.jst.j2ee.internal.wizard.FlexibleProjectCreationWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.FlexibleProjectCreationWizard"
- >
- <description>
- %new.flexible.project.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>-->
-<!-- EAR Component Wizard -->
- <wizard
- name="%ear_component_ui_"
- icon="icons/full/ctool16/newear_wiz.gif"
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
- <description>
- %new.ear.component.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
-<!-- Application Client Component Wizard -->
- <wizard
- name="%appclient_component_ui_"
- icon="icons/full/ctool16/newappclient_wiz.gif"
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <description>
- %new.appclient.component.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
-<!-- Utility Component Wizard -->
- <wizard
- name="%util-project-wizard-name"
- icon="icons/util-wiz-icon.gif"
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard">
- <description>
- %util-project-wizard-description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
-
- </extension>
-
-<!--================================-->
-<!-- Import Wizard Contributions -->
-<!--================================-->
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%client.jar.file_ui_"
- icon="icons/full/ctool16/appclient_import_wiz.gif"
- class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard"
- id="org.eclipse.jst.j2ee.ui.AppClientModuleImportWizardNew">
- <description>
- %client.import.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <wizard
- name="%ear.file_ui_"
- icon="icons/full/ctool16/import_ear.gif"
- class="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard"
- id="org.eclipse.jst.j2ee.ui.EnterpriseApplicationImportWizardNew">
- <description>
- %ear.import.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <!-- <wizard
- class="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizard"
- icon="icons/jar_obj.gif"
- name="%utility_jar_import_wizard"
- id="org.eclipse.jst.j2ee.ui.J2EEUtilityJarImportWizard">
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <wizard
- name="%Import_Classes"
- icon=""
- class="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard"
- id="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard">
-
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension> -->
-<!--================================-->
-<!-- Export Wizard Contributions -->
-<!--================================-->
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- name="%client.jar.file_ui_"
- icon="icons/full/ctool16/appclient_export.gif"
- class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard"
- id="org.eclipse.jst.j2ee.ui.AppClientModuleExportWizard">
- <description>
- %client.export.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <wizard
- name="%ear.file_ui_"
- icon="icons/full/ctool16/export_ear.gif"
- class="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard"
- id="org.eclipse.jst.j2ee.ui.EnterpriseApplicationExportWizard">
- <description>
- %ear.export.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </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/ejb_module_ovr.gif"
- natureId="org.eclipse.jst.j2ee.ejb.EJBNature"
- id="org.eclipse.ui.ejbProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/enterprise_app_ovr.gif"
- natureId="org.eclipse.jst.j2ee.EARNature"
- id="org.eclipse.ui.earProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/client_app_ovr.gif"
- natureId="org.eclipse.jst.j2ee.ApplicationClientNature"
- id="org.eclipse.ui.appClientModProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/connector_ovr.gif"
- natureId="org.eclipse.jst.j2ee.jca.ConnectorNature"
- id="org.eclipse.ui.ConnectorModProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/web_module_ovr.gif"
- natureId="org.eclipse.jst.j2ee.web.WebNature"
- id="org.eclipse.ui.webProjectNatureImage">
- </image>
- </extension>
-
-<!-- Navigator Object Contributions -->
-<!-- EAR Group Contributions
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.earNewProjectActions">
- <action
- label="%ear.project_ui_"
- icon="icons/full/ctool16/newear_wiz.gif"
- class="org.eclipse.jst.j2ee.internal.actions.NewEARProjectAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.new.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.newEARAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- -->
-<!-- Navigator Object Contributions -->
-<!-- Application Client Group Contributions
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.appClientNewProjectActions">
- <action
- label="%appclient.project_ui_"
- icon="icons/full/ctool16/newappclient_wiz.gif"
- class="org.eclipse.jst.j2ee.internal.actions.NewApplClientProjectAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.new.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.newAppClientAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- -->
-<!-- Navigator Object Contributions -->
-
- <extension
- point="org.eclipse.wst.common.frameworks.ui.wtpuiAction">
- <masterOperation
- description="Delete the dependent J2EE modules"
- extendedGenericId="org.eclipse.wst.common.generic.Delete"
- populatorClass="org.eclipse.jst.j2ee.internal.ui.actions.J2EEDeleteModuleActionPopulator"
- operationClass="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.IActionWTPOperation"
- name="Delete J2EE Dependent Modules"
- alwaysExecute="true"
- overrideId="org.eclipse.wst.common.actions.Java.delete">
- <selectionEnablement>
- <or>
- <and>
- <objectClass name="org.eclipse.core.resources.IProject"
- adaptable="true" />
- <or>
- <objectState
- value="org.eclipse.jst.j2ee.EARNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.ApplicationClientNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.jca.ConnectorNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.ejb.EJBNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.web.WebNature"
- name="projectNature" />
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.client.ApplicationClient">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.jca.Connector">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.EJBJar">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.webapplication.WebApp">
- </objectClass>
- </or>
- </selectionEnablement>
- </masterOperation>
- </extension>
-
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- className="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEEjbItemProviderAdapterFactory"
- packageURI="ejb.xmi"
- id="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEEjbItemProviderAdapterFactory">
- <!-- <view
- id="org.eclipse.wst.navigator.ui.WTPCommonNavigator">
- </view> -->
- <view
- id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator">
- </view>
- </adapterFactory>
- <adapterFactory
- className="org.eclipse.jst.j2ee.internal.war.ui.util.J2EEWebItemProviderAdapterFactory"
- packageURI="webapplication.xmi"
- id="org.eclipse.jst.j2ee.internal.war.ui.util.J2EEWebItemProviderAdapterFactory">
- <!-- <view
- id="org.eclipse.wst.navigator.ui.WTPCommonNavigator">
- </view> -->
- <view
- id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator">
- </view>
- </adapterFactory>
- <adapterFactory
- className="org.eclipse.jst.j2ee.internal.provider.J2EEApplicationItemProviderAdapterFactory"
- packageURI="application.xmi"
- id="org.eclipse.jst.j2ee.internal.provider.J2EEApplicationItemProviderAdapterFactory">
- <!-- <view
- id="org.eclipse.wst.navigator.ui.WTPCommonNavigator">
- </view> -->
- <view
- id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator">
- </view>
- </adapterFactory>
- <adapterFactory
- className="org.eclipse.jst.j2ee.internal.provider.J2EEModulemapItemProviderAdapterFactory"
- packageURI="modulemap.xmi"
- id="org.eclipse.jst.j2ee.internal.provider.J2EEModulemapItemProviderAdapterFactory">
- <!-- <view
- id="org.eclipse.wst.navigator.ui.WTPCommonNavigator">
- </view> -->
- <view
- id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator">
- </view>
- </adapterFactory>
- </extension>
-
-
-
-
-<!-- Navigator Object Contributions -->
-<!-- EAR Group Contributions
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.earProjectActions">
- <action
- label="%ear.file_ui_"
- icon="icons/full/ctool16/import_ear.gif"
- class="org.eclipse.jst.j2ee.internal.ear.actions.ImportEARAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.importEARAction">
- </action>
- <action
- label="%ear.file_ui_"
- icon="icons/full/ctool16/export_ear.gif"
- class="org.eclipse.jst.j2ee.internal.ear.actions.ExportEARAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.exportEARAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- -->
-<!-- Navigator Object Contributions -->
-<!-- Application Client Group Contributions
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.appClientProjectActions">
- <action
- label="%client.jar.file_ui_"
- icon="icons/full/ctool16/appclient_import_wiz.gif"
- class="org.eclipse.jst.j2ee.internal.client.actions.ImportApplicationClientAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.importAppClientAction">
- </action>
- <action
- label="%client.jar.file_ui_"
- icon="icons/full/ctool16/appclient_export.gif"
- class="org.eclipse.jst.j2ee.internal.client.actions.ExportApplicationClientAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.exportAppClientAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- -->
-<!-- Navigator Object Contributions -->
-<!-- ================================================== -->
-<!-- DEPLOY EXTENSIONS -->
-<!-- ================================================== -->
-<!-- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="java.lang.Object"
- nameFilter="*"
- id="org.eclipse.jst.j2ee.internal.ui.deploy">
- <action
- label="%deploy_ui_"
- icon="icons/full/ctool16/re_execute.gif"
- class="org.eclipse.jst.j2ee.internal.actions.J2EEDeployAction"
- menubarPath="additions"
- id="deployAction">
- </action>
- <visibility>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EJBJar">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EnterpriseBean">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.WebApp">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.Connector">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.client.ApplicationClient">
- </objectClass>
-
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.componentcore.ModuleCoreNature">
- </objectState>
-
- </or>
- </visibility>
- </objectContribution>
- </extension> -->
-<!-- Navigator Object Contributions -->
-
- <extension point="org.eclipse.ui.propertyPages">
-
-
-<!-- =========== org.eclipse.jst.j2ee.internal.J2EEDependencyPage ============ -->
- <page
- objectClass="org.eclipse.core.resources.IProject"
- name="%J2EEDependenciesPage.name"
- class="org.eclipse.jst.j2ee.internal.J2EEDependenciesPage"
- id="org.eclipse.jst.j2ee.internal.J2EEDependenciesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </filter>
- </page>
- <page
- objectClass="org.eclipse.jdt.core.IJavaProject"
- name="%J2EEDependenciesPage.name"
- class="org.eclipse.jst.j2ee.internal.J2EEDependenciesPage"
- id="org.eclipse.jst.j2ee.internal.J2EEDependenciesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </filter>
- </page>
-
- <page
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- name="%j2ee"
- class="org.eclipse.jst.j2ee.internal.ui.J2EEPropertiesPage"
- id="J2EEPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </filter>
- </page>
- </extension>
-
-<!--
- <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-
- <renameParticipant
- class="org.eclipse.jst.j2ee.internal.actions.J2EERenameParticipant"
- id="org.eclipse.jst.j2ee.internal.actions.J2EERenameParticipant"
- name="%J2EE_Rename_Participant">
- <enablement>
- <with variable="affectedNatures">
- <iterate operator="or">
- <equals value="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
-
- </iterate>
- </with>
- <with variable="element">
- <instanceof value="org.eclipse.core.resources.IProject" />
-
- </with>
- </enablement>
- </renameParticipant>
- </extension>
-
- <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-
- <renameParticipant
- class="org.eclipse.jst.j2ee.internal.actions.J2EEComponentRenameParticipant"
- id="org.eclipse.jst.j2ee.internal.actions.J2EEComponentRenameParticipant"
- name="J2EE Rename Participant">
- <enablement>
- <with variable="affectedNatures">
- <iterate operator="or">
- <equals value="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
- </iterate>
- </with>
- <with
- variable="element">
- <instanceof
- value="org.eclipse.wst.common.componentcore.resources.IVirtualComponent">
- </instanceof>
- </with>
- </enablement>
- </renameParticipant>
- </extension> -->
-
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- name="%j2ee"
- icon="icons/full/cview16/j2ee_perspective.gif"
- class="org.eclipse.jst.j2ee.internal.perspective.J2EEPerspective"
- id="org.eclipse.jst.j2ee.J2EEPerspective">
- </perspective>
- </extension>
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.jst.j2ee.J2EEPerspective">
- <perspectiveShortcut id="org.eclipse.debug.ui.DebugPerspective"/>
- <perspectiveShortcut id="org.eclipse.jdt.ui.JavaPerspective"/>
- <perspectiveShortcut id="org.eclipse.ui.resourcePerspective"/>
- </perspectiveExtension>
- <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
- <perspectiveShortcut id="org.eclipse.jst.j2ee.J2EEPerspective"/>
- </perspectiveExtension>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.navigator.workbench.commonWizard">
- <!-- EAR New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentCreationWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </objectState>
- </or>
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- AppClient New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Module">
- </objectClass>
-
- </or>
- </enablement>
- </commonWizard>
- <!-- EAR Import -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.ui.EnterpriseApplicationImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </and>
-
- </or>
- </enablement>
- </commonWizard> -->
- <!-- App Client Import -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.ui.AppClientModuleImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- </and>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- <!-- Utility Jar Import -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.ui.J2EEUtilityJarImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMapImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- <!-- EAR export -->
- <!-- <commonWizard
- type="export"
- wizardId="org.eclipse.jst.j2ee.ui.EnterpriseApplicationExportWizard">
- <enablement>
- <or>
- <and>
- <or>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- </or>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- <!-- App Client export -->
- <!-- <commonWizard
- type="export"
- wizardId="org.eclipse.jst.j2ee.ui.AppClientModuleExportWizard">
- <enablement>
- <or>
- <and>
- <or>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- </or>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- <!-- Import Classes Wizard -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard">
- <enablement>
- <or>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.jca.ConnectorNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ejb.EJBNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.web.WebNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.earcreation.IEarComponentCreationDataModelProperties"/>
- </extension>
-
- <extension
- id="context.Sensitive.Class.workingCopyManager"
- name="Working Copy Manager - UI Context Class"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- context="UI"
- key="workingCopyManager"
- className="org.eclipse.jst.common.jdt.internal.integration.ui.WTPUIWorkingCopyManager">
- </uiContextSensitiveClass>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.application.Application">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ear1"
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.j2ee.application.Application"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ear2"
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ear3"
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizard">
-
- <!-- <wizard-pages facet="jst.utility" version="1.0">
- <install>
- <page class="org.eclipse.jst.j2ee.ui.project.facet.UtilityFacetInstallPage"/>
- </install>
- </wizard-pages> -->
-
- <wizard-pages facet="jst.ear" version="1.2">
- <install>
- <page class="org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.ear" version="1.3">
- <install>
- <page class="org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.ear" version="1.4">
- <install>
- <page class="org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.appclient" version="1.2">
- <install>
- <page class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.appclient" version="1.3">
- <install>
- <page class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.appclient" version="1.4">
- <install>
- <page class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientFacetInstallPage"/>
- </install>
- </wizard-pages>
- </extension>
-
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.jst.common.frameworks.javaVersionMismatch"
- class="org.eclipse.jst.j2ee.ui.project.facet.JavaVersionMismatchMarkerResolutions">
- </markerResolutionGenerator>
- </extension>
-
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.jst.j2ee.differentRuntimesDetected"
- class="org.eclipse.jst.j2ee.ui.project.facet.RuntimeMismatchMarkerResolutions">
- </markerResolutionGenerator>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.ComponentProjectMigrator">
- <migratorExtension class="org.eclipse.jst.j2ee.internal.J2EEComponentProjectMigrator"/>
- </extension>
-
-
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml
deleted file mode 100644
index d3bfda0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.j2ee.ui"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties
deleted file mode 100644
index 0a6de07..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pageTitle = Utility Module
-pageDescription = Configure utility module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties
deleted file mode 100644
index 0ada374..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-RelationshipPolyLine_UI_0=Navigation
-RelationshipPolyLine_UI_1=Navigation
-RelationshipPolyLine_UI_2=Cmr Field / Foreign Key
-RelationshipPolyLine_UI_3=Cmr Field / Foreign Key
-RelationshipPolyLine_UI_4=Edit left end
-RelationshipPolyLine_UI_5=Edit right
-RelationshipPolyLine_UI_6=Edit left end
-RelationshipPolyLine_UI_7=Edit right end
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties
deleted file mode 100644
index 1dd2b36..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties
+++ /dev/null
@@ -1,47 +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
-###############################################################################
-KEY_0=Failed to find the image "{0}".
-KEY_1=New EJB Project
-KEY_2=EJB version:
-KEY_3=EJB Project
-KEY_4=Create an EJB project and add it to a new or existing Enterprise Application.
-KEY_5=Import an EJB jar from the file system
-KEY_6=EJB Jar Import
-KEY_7=EJB Jar file:
-KEY_8=EJB Project:
-KEY_9=EJB Jar Export
-KEY_10=Export EJB project to the local file system.
-KEY_11=EJB client JAR Creation
-KEY_12=Use this wizard to create an EJB client JAR from your existing EJB
-KEY_13=Client JAR URI:
-KEY_14=Project name:
-KEY_15=Project location:
-KEY_16=EJB Project:
-KEY_17=Delete Bean Only
-KEY_18=Delete Bean Classes
-KEY_19=Delete Access Bean
-KEY_20=Delete Deployed Code
-KEY_21=Select All
-KEY_22=Deselect All
-KEY_23=The selected enterprise bean cannot be deleted because it is involved in\nrelationships with other enterprise beans. You must first delete these\nrelationships before deleting the bean.
-KEY_24=Delete...
-KEY_25=Cannot delete Enterprise Bean
-KEY_26=Cannot delete the bean named "{0}" because it is in a binary project.
-KEY_27=Delete Enterprise Bean(s)
-KEY_28=What options would you like when deleting the selected\nEnterprise Bean(s)?
-GroupedEJBJarItemProvider_UI_0=Session
-GroupedEJBJarItemProvider_UI_1=Entity
-GroupedEJBJarItemProvider_UI_2=Message
-NewEJBProjectAction_UI_0=EJB Project
-NewEJBModuleAction_UI_0=EJB Project
-pageTitle=Ejb Module
-pageDescription=Configure ejb module settings.
-configFolderLabel=Config Folder:
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties
deleted file mode 100644
index fc3565e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties
+++ /dev/null
@@ -1,15 +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
-###############################################################################
-
-GroupedEJBJarItemProvider_UI_0=Session
-GroupedEJBJarItemProvider_UI_1=Entity
-GroupedEJBJarItemProvider_UI_2=Message
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
deleted file mode 100644
index 24f5350..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
+++ /dev/null
@@ -1,326 +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
-###############################################################################
-1=Project location:
-2=Target runtime:
-3=J2EE version:
-4=Failed to find the image "{0}".
-5=New Enterprise Application Project
-6=Enterprise Application Project
-7=Create an Enterprise Application project containing one or more module projects.
-8=EAR Module Projects
-9=Select the module projects to add to the new EAR project from the list. \nSelect New Module button to create a new module project.
-10=&Select All
-11=&Deselect All
-12=New &Module...
-13=EAR application:
-14=N&ew...
-14a=Ne&w...
-15=Add module to an EAR application.
-16=New Module Project
-17=Create a new module project for the selected module type
-18=New Module Project
-19=Create default module projects.
-20=Application Client module:
-21=EJB module:
-22=Web module:
-23=Connector module:
-24=New Application Client Project
-25=Application Client module
-26=Create an Application Client project and add it to a new or existing Enterprise Application project
-27=Module Dependencies
-28=Select dependent JARs for the module within the Enterprise Application project.
-29=Available dependent JARs:
-30=Manifest Class-Path:
-31=JAR/Module
-32=Project:
-33=New
-34=Import an Application Client project from the file System
-35=Application Client Import
-36=Application Client file:
-37=Application Client project:
-38=Import
-39=Import an Enterprise Application project based on selected resources.
-40=Enterprise Application Import
-41=EAR file:
-42=Overwrite existing resources without warning.
-43=Project import
-44=Optimized: make binary projects for EJB, client, and utility JARs
-45=Expanded: extract project contents for development
-46=Import for partial EAR development
-47=Select All
-48=Deselect All
-49=Utility JARs and web libraries
-50=Select the utility JARs from the list to be imported as utility projects. Unselected JARs will be imported as \nutility JARs in the EAR.
-51=Enter the new project name that will be created for the imported module file by selecting the second column of the table for edit.
-52=EAR Module and Utility JAR Projects
-53=Project locations
-54=This is the parent directory for all referenced projects. A subdirectory will be created for each project.
-55=Module Root Location:
-
-57=Select the location directory
-58=Modules in EAR
-59=New Project Name
-60=filenames
-61=projectnames
-62=Destination:
-63=Overwrite existing file
-64=Export source files
-65=Application Client Export
-66=Export Application Client project to the local file system.
-67=Export
-68=EAR Export
-69=Export Enterprise Application project to the local file system.
-70=Include project build paths and meta-data files
-71=If you select this option, the exported EAR maintains project names and external classpath dependencies, which are useful for later importing the EAR into binary projects. If you select this option and later import the EAR, only binary projects are created.
-72=Include
-74=Allow nested projects overwrites (module and utility projects)
-75=Delete project on overwrite
-76=EAR project:
-
-#migration strings
-77=Error
-78=An internal error occurred performing the selected action.
-79=Binary Project
-80=The action cannot be performed on the selection, which is part of a binary project.
-81=Information
-82=The chosen operation is not currently available.
-
-90=Create an EJB Client JAR module to hold the client interfaces and classes.
-91=Generate an annotated bean class
-92=Add support for annotated Java classes
-93=B&rowse...
-94=Na&me:
-95=Create a default Main class
-96=Create a default stateless session bean
-98=Generate an annotated servlet class
-
-97=Select the utility JARs from the list to be imported as utility projects or jars.
-99=Project Name:
-100=Module Version:
-101=Configure Application Client module settings.
-102=Content Folder:
-Entity_UI_=Entity Beans
-Message_Driven_Beans_UI_=Message-Driven Beans
-Session_Beans_UI_=Session Beans
-EJB_Class_UI_=EJB Class: {0}
-Home_Interface_UI_=Home Interface: {0}
-Service_Endpoint_Interface_UI_=Service Endpoint Interface: {0}
-Primary_Key_Class_UI_=Primary Key Class: {0}
-Remote_Interface_UI_=Remote Interface: {0}
-Local_Interface_UI_=Local Interface: {0}
-Local_Home_Interface_UI_=Local Home Interface: {0}
-Delete_UI_=Delete...
-Project_should_not_be_null_1_EXC_=IWAE0021E Project should not be null
-Non-project_in_selection_2_EXC_=IWAE0022E Non-project in selection
-Problems_Opening_Editor_ERROR_=IWAE0052E Problems Opening Editor.
-Utility_JARs_UI_=Utility JARs
-Delete_1=Delete...
-Delete_selected_project(s)_2=Delete selected project(s)
-Remove_module(s)_from_all_Enterprise_Applications_3=Remove module(s) from all Enterprise Applications
-Remove_module(s)_from_all_other_Enterprise_Applications_4=Remove module(s) from all other Enterprise Applications
-Remove_module_dependencies_referencing_selected_project(s)_5=Remove module dependencies referencing selected project(s)
-Delete_Module_Options_6=Delete Module Options
-Delete_Enterprise_Application_Options_7=Delete Enterprise Application Options
-Delete_could_not_be_completed_8=Delete could not be completed
-Delete_error_9=Delete error
-What_would_you_like_to_delete__10=What would you like to delete?
-Delete_selected_Enterprise_Application_project(s)_only_11=Delete selected Enterprise Application project(s) only
-Also_delete_module_and_utility_Java_projects_12=Also delete module and utility Java projects
-Delete_selected_project(s)_only_13=Delete selected project(s) only
-Also_delete_references_to_selected_project(s)_14=Also delete references to selected project(s)
-CUSTOM_DELETE_MIX_MATCH_UI_=The custom J2EE delete options are not available for the selected J2EE projects. The standard delete options will be used.
-DEPLOY_DIALOG_TITLE=J2EE Deployment
-DEPLOY_ERROR_TEXT=IWAE0001E Error:
-DEPLOY_WARNING_TEXT=Warning:
-DEPLOY_INFO_TEXT=IWAE0002I Info:
-DEPLOY_OK_TEXT=Ok:
-DEPLOYMENT_IN_PROGRESS=Deployment operation in progress...
-DEPLOY_SUCCESS_REPORT=Deployment finished successfully.
-DEPLOY_WARNINGS_REPORT=Deployment finished with warnings; see log files for details.
-DEPLOY_ERRORS_REPORT=Deployment finished with errors; see log files for details.
-
-NewModuleSelectionPage.appClient=Application Client
-NewModuleSelectionPage.ejb=Enterprise Java Bean
-NewModuleSelectionPage.web=Web
-NewModuleSelectionPage.jca=Connector
-
-NewApplClientModuleAction_UI_0=Application Client Module
-NewEARModuleAction_UI_0=EAR Module
-J2EEProjectCreationPage_UI_0=Hide &Advanced <<
-J2EEProjectCreationPage_UI_1=Show &Advanced >>
-J2EEUtilityJarImportPage_UI_0=Utility Jar Import
-J2EEUtilityJarImportPage_UI_1=Import dependent Utility Jars for J2EE Enterprise Applications
-J2EEUtilityJarImportPage_UI_2=Available Utility Jars Directory
-J2EEUtilityJarImportPage_UI_3=External Jar Directory:
-J2EEUtilityJarImportPage_UI_4=Linked Path Variable
-J2EEUtilityJarImportPage_UI_5=Make these imported files team-shareable by creating or re-using a Linked Path Variable (LPV). Select an existing LPV or type a new name to create one to the directory above. Other teammates should define this value through Window > Preferences | Workbench > Linked Resources. This option is only available for linked imports.
-J2EEUtilityJarImportPage_UI_6=Overwrite Existing Resources (projects and archives)
-J2EEUtilityJarImportPage_UI_7=Select Utility Jar:
-J2EEUtilityJarImportPage.0=Use Existing Linked Path Variable
-J2EEUtilityJarImportPage.1=Linked Path Variable:
-EARImportProjectsPage_UI_0=include
-EARImportProjectsPage_UI_1=file
-EARImportProjectsPage_UI_2=project
-EARImportProjectsPage_UI_3=Select New
-
-J2EEUtilityJarImportTypePage_UI_0=Utility Jar Import
-J2EEUtilityJarImportTypePage_UI_1=Import dependent Utility Jars for J2EE Enterprise Applications
-J2EEUtilityJarImportTypePage_UI_2=Select import type
-J2EEUtilityJarImportTypePage_UI_3=Create Java Projects from Utility Jars
-J2EEUtilityJarImportTypePage_UI_4=Create linked Java Projects from Utility Jars
-J2EEUtilityJarImportTypePage_UI_5=Copy Utility Jars into an existing EAR from an external location
-J2EEUtilityJarImportTypePage_UI_6=Create Linked Utility Jars in an existing EAR from an external location
-J2EEUtilityJarImportTypePage_UI_7=Project import options
-J2EEUtilityJarImportTypePage_UI_8=Select EAR Project
-J2EEUtilityJarImportTypePage_UI_9=EAR Project:
-J2EEUtilityJarImportTypePage_UI_10=Create Binary Projects
-J2EEUtilityJarImportTypePage_UI_11=Override Project Root (Specify location below)
-
-Deployment_Descriptor_UI_=Deployment Descriptor
-
-Rename_1=Rename
-Rename_selected_project_2=Rename selected project
-Rename_module_in_all_Enterprise_Applications_3=Rename module in all Enterprise Applications
-Rename_module_in_all_other_Enterprise_Applications_4=Rename module in all other Enterprise Applications
-Rename_module_dependencies_referencing_selected_project_5=Rename module dependencies referencing selected project
-Rename_Module_Options_6=Rename Module Options
-Rename_Enterprise_Application_Options_7=Rename Enterprise Application Options
-Rename_could_not_be_completed_8=Rename could not be completed
-Rename_error_9=Rename error
-What_would_you_like_to_rename_this_to__10=What would you like to rename this to?
-Context_Root__11=Context root:
-Rename_selected_Enterprise_Application_project_only_12=Rename selected Enterprise Application project only
-Also_rename_module_and_utility_Java_projects_13=Also rename module and utility Java projects
-Project_already_exists.=Project {0} already exists.
-Project_should_not_be_null_1_EXC_=IWAE0021E Project should not be null
-Non-project_in_selection_2_ERROR_=IWAE0024E Non-project in selection
-
-
-ERROR_OCCURRED_TITLE=Error
-ERROR_OCCURRED_MESSAGE=An internal error occurred performing the selected action.
-
-Import_Class_Files_UI=Import
-FileImport.selectSource=Select a directory to import from.
-Import_Classes=Import Class Files...
-ClassesImport.fromDir=Import from Directory
-ClassesImport.fromZip=Import from Zip or Jar
-DataTransfer.browse=Browse...
-DataTransfer.directory=Source:
-DataTransfer.fileSystemTitle=Import Class Files
-FileImport.importFileSystem=Import class files from the local file system.
-FileImport.sourceEmpty=Source must not be empty.
-FileImport.overwriteExisting=Overwrite existing resources without warning
-DataTransfer.selectAll=Select All
-DataTransfer.deselectAll=Deselect All
-Import_Class_Files_UI=Import
-FileImport.selectSource=Select a directory to import from.
-Inconsistent_Files_3=Inconsistent Files
-The_following_workspace_files_are_inconsistent_with_the_editor_4=The following workspace files are inconsistent with the editor: \n
-Update_the_editor_with_the_workspace_contents__5=Update the editor with the workspace contents?
-Error_checking_out_files_10=Error checking out files
-Inconsistent_files_detected_11=Inconsistent files detected
-Modules_UI_=Modules
-Utility_Java_Projects_UI_=Project Utility JARs
-The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_=IWAE0020W The following files are inconsistent with the file system.\nDo you want to save and overwrite these files on the file system?
-J2EE_Level=J2EE Level:
-J2EE_12=1.2
-J2EE_13=1.3
-J2EE_14=1.4
-J2EE_12_DESCRIPTION=J2EE 1.2 includes Servlet Specification level 2.2, JSP Specification level 1.1, and EJB Specification level 1.1.
-J2EE_13_DESCRIPTION=J2EE 1.3 includes Connector Architecture Specification level 1.0, Servlet Specification level 2.3, JSP Specification level 1.2, and EJB Specification level 2.0.
-J2EE_14_DESCRIPTION=J2EE 1.4 includes Connector Architecture Specification level 1.5, Servlet Specification level 2.4, JSP Specification level 1.3, and EJB Specification level 2.1.
-EJB_LEVEL=EJB Level:
-EJB_11=1.1
-EJB_20=2.0
-EJB_21=2.1
-EJB_11_DESCRIPTION=EJB 1.1 includes Session Beans, BMP Beans and CMP 1.1 Beans. EJB 1.1 modules may be included in either J2EE 1.2 or J2EE 1.3 Enterprise Applications.
-EJB_20_DESCRIPTION=EJB 2.0 includes Message-Driven Beans, BMP Beans, and CMP 1.1 and CMP 2.0 Beans. EJB 2.0 modules may only be included in J2EE 1.3 Enterprise Applications.
-EJB_21_DESCRIPTION=EJB 2.1 includes Message-Driven Beans, BMP Beans, and CMP 1.1 and CMP 2.0 Beans. EJB 2.1 modules may only be included in J2EE 1.4 Enterprise Applications.
-WEB_LEVEL=Web Level:
-WEB_22=2.2
-WEB_23=2.3
-WEB_24=2.4
-WEB_22_DESCRIPTION=Web 2.2 includes Servlet specification 2.2 and JSP specification 1.1.
-WEB_23_DESCRIPTION=Web 2.3 includes Servlet specification 2.3 and JSP specification 1.2.
-WEB_24_DESCRIPTION=Web 2.4 includes Servlet specification 2.4 and JSP specification 2.0.
-APP_CLIENT_LEVEL=Application Client Level:
-APP_CLIENT_12_DESCRIPTION=Application 1.2 includes the Applciation client specification level 1.2.
-APP_CLIENT_13_DESCRIPTION=Application 1.3 includes the Applciation client specification level 1.3.
-APP_CLIENT_14_DESCRIPTION=Application 1.4 includes the Applciation client specification level 1.4.
-CONNECTOR_LEVEL=Connector Architecture Level:
-CONNECTOR_10=1.0
-CONNECTOR_15=1.5
-CONNECTOR_10_DESCRIPTION=Connector Architecture 1.0 modules may only be included in J2EE 1.3 Enterprise Applications.
-CONNECTOR_15_DESCRIPTION=Connector Architecture 1.5 modules may only be included in J2EE 1.4 Enterprise Applications.
-DESCRIPTION=Description:
-WEB_CONTEXT_ROOT=Context Root:
-WEB_CONTENT_FOLDER_NAME=Web content folder name:
-FileImport.invalidSource = Source directory is not valid or has not been specified.
-FileImport.importProblems = Import Problems
-DataTransfer.information = Information
-FileImport.noneSelected = There are no resources currently selected for import.
-File_Selection_UI_=File Selection
-Select_a_file__UI_=Select a file:
-Flexible_Structure=Use flexible project structure
-FlexibleProjectCreationWizard.mainPage.title=J2EE Project
-FlexibleProjectCreationWizard.mainPage.desc=Create a J2EE project.
-FlexibleProjectCreationWizard.title=J2EE Project
-EARComponentCreationWizard.title=New EAR Application Project
-EARComponentCreationWizard.mainPage.title=EAR Application Project
-EARComponentCreationWizard.mainPage.desc=Create a EAR application.
-EARComponentCreationWizard.secondPage.title=J2EE Modules to Add to the EAR
-EARComponentCreationWizard.secondPage.desc=Select the J2EE modules to add to the new EAR application from the list. \nSelect New Module button to create a new J2EE module.
-AppClientComponentCreationWizard.title=New Application Client Project
-AppClientComponentCreationWizard.mainPage.title=Application Client Project
-AppClientComponentCreationWizard.mainPage.desc=Create a Application Client.
-DefaultJ2EEComponentCreationWizard.title=Create default J2EE modules.
-DefaultJ2EEComponentCreationWizard.page.title=New J2EE Module
-DefaultJ2EEComponentCreationWizard.page.desc=Create a new J2EE module for the selected module type
-DefaultJ2EEComponentCreationWizard.page.label.ejb=EJB module
-DefaultJ2EEComponentCreationWizard.page.label.web=Web module
-DefaultJ2EEComponentCreationWizard.page.label.jca=Connector module
-DefaultJ2EEComponentCreationWizard.page.label.appclient=Application client module
-DefaultJ2EEComponentCreationWizard.page.button.select=Create default modules
-
-FOLDER_LABEL=Folder:
-BROWSE_BUTTON_LABEL=Browse...
-JAVA_PACKAGE_LABEL=Java package:
-CLASS_NAME_LABEL=Class name:
-SUPERCLASS_LABEL=Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose a valid java source folder for the selected module.
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=Public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abstract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=Final
-JAVA_CLASS_INTERFACES_LABEL=Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=Inherited abstract methods
-ADD_BUTTON_LABEL=Add...
-REMOVE_BUTTON=Remove
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-JAVAUTILITY_MAIN_PG_TITLE=Java Component
-JAVAUTILITY_MAIN_PG_DESC=Create a Java Component
-JAVAUTIL_COMPONENT_WIZ_TITLE=New Java Utility Module
-AVAILABLE_J2EE_COMPONENTS= Available J2EE modules
-EXTERNAL_JAR=Add External JARs...
-PROJECT_JAR=Add JARs...
-ADDVARIABLE=Add Variable...
-SUPPORTMULTIPLEMODULES=Support Multiple Modules per project
-SOURCEFOLDER=Source Folder:
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties
deleted file mode 100644
index f8ff5fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties
+++ /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
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Connector Project
-_2=J2C version:
-_3=Connector Project
-_4=Create a standalone Connector module or add it to a new or existing Enterprise Application project.
-_5=Import a Connector module from the file system
-_6=Connector Import
-_7=Connector file:
-_8=Connector module:
-_9=Connector Export
-_10=Export Connector module to the local file system.
-_11=Configure Connector module settings.
-connector_export_action_label_ui_=Export RAR File...
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties
deleted file mode 100644
index 48cd6de..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-Up_1=&Up
-Down_2=&Down
-Select_All_3=Select &All
-Deselect_All_4=D&eselect All
-ERROR_READING_MANIFEST_DIALOG_TITLE=Error Reading Manifest
-SAVE_MANIFEST_WITH_ERROR=The manifest file contains errors and can not be parsed. The file will be saved but the Java build path will not be updated. Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR=The manifest file contains errors and can not be parsed. Other pages cannot be used until these errors are corrected. Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE=The manifest file contains errors and can not be parsed. Following are common limitations which can cause problems:
-MANIFEST_PROBLEM_1=* Lines in the file must be no greater than 72 bytes. Continuation of long lines is indicated by a new line and a space.
-MANIFEST_PROBLEM_2=* The last line in the file must end with a new line or it will not be parsed.
-MANIFEST_PROBLEM_3=* Blank lines with extra white space may cause parse to fail.
-MANIFEST_PROBLEM_4=* The attributes must be formatted correctly. Refer to the manifest and JAR file specification for more information.
-An_internal_error_occurred_ERROR_=IWAE0010E An internal error occurred:
-Project_name__UI_=Project name:
-EAR_Project_Name__UI__UI_=Enterprise application project name:
-Available_dependent_JARs__UI_=Available dependent JARs:
-Manifest_Class_Path__UI_=Manifest Class-Path:
-JAR_Module_UI_=JAR/Module
-Project_UI_=Project
-EAR_Modules=EAR Modules:
-EAR_Modules_Desc=This property page lets you setup the module dependencies in an Enterprise Application.
-J2EE_Modules=J2EE Modules
-J2EE_Modules_Desc=This property page lets you setup the J2EE module dependencies with other J2EE modules within an Enterprise Application. All modules involved in the dependency need to belong to the same Enterprise Application.
-Web_Libraries=Web Libraries
-Web_Libraries_Desc=This property page lets you add the Web Library dependency to other Java modules in the workspace. This dependency resolves the Java modules into the WEB-INF\\lib folder of the web module at deployment time.
-EAR_Module_Dep_Error=J2EE Modules is not valid for EAR modules.
-Jar_Dep_One_Module_Error=Java Jar Dependencies is valid only for one module per flexible project.
-Web_Lib_Error=Web library settings are only valid for Web modules.
-REDIRECT_TEXT_EDITOR_UI_=REDIRECT_TEXT_EDITOR_UI_
-Error_Checking_Project_Facets=Error checking project facets.
-Error_Checking_Project_Facets=Error checking project facets.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/migwizards.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/migwizards.properties
deleted file mode 100644
index 0282152..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/migwizards.properties
+++ /dev/null
@@ -1,187 +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
-###############################################################################
-#migration wizards
-Select_All=Select All
-Deselect_All=Deselect All
-Migration_Wizard_Title_=J2EE Migration Wizard
-J2EE_Migration_Wizard_Welcome_=J2EE Migration Wizard Welcome Page
-Welcome_To_The_J2EE_Migration_Wizard_=Welcome to the J2EE Migration Wizard
-Please_Read_The_Following_Information_=Please read the following information, then click Next.
-The_Migration_Wizard_Guides_The_Process_=The Migration Wizard guides the process of optionally migrating your J2EE project structures and the J2EE version of the associated projects.
-Prior_To_Proceeding_With_The_Migration_Wizard_=Prior to proceeding with the Migration Wizard it is strongly recommended you:
-Read_The_Online_Help_Section_=Read the online help on Migrating applications to J2EE 1.3 and J2EE 1.4 specification levels."
-Backup_Your_Entire_Workspace_=Backup your entire workspace.
-If_Working_With_A_Repository_=If working with a repository, "check out" or "lock" all corresponding projects.
-Once_The_Migration_Wizard_Is_Complete_=Once the Migration Wizard is complete, the details of the steps performed during migration will be presented in a results window. This information is also written to the LoggingUtil.log file in the .metadata folder in your local workspace.
-Based_On_The_Number_Of_Projects_=Based on the number of projects, migration may take a few minutes.
-Enterprise_Application_=Enterprise Application
-The_following_enterprise_application_project_=The following enterprise application project will be migrated. The project structure migration is optional.
-Enterprise_Application_Project_=Enterprise Application Project:
-Migrate_Project_Structure_=Migrate project structure.
-Migrate_Project_From_Version_=Migrate project J2EE specification level.
-Version_Level=J2EE version
-TARGET_SERVER=Target Server
-The_Project_Version_And_The_Deployment_Descriptor_=The project version and the deployment descriptor are migrated for the enterprise application. This migration allows for the inclusion of J2EE 1.3 modules into the enterprise application.
-Migrate_All_Module_Projects_=Migrate all module projects
-All_EJB_Web_Application_Client_Modules_Referenced_=All EJB, web, and application client modules referenced by the enterprise application are automatically selected for migration.
-Select_The_Finish_Button_To_Accept_The_Default_=Select the Finish button to accept the default migration options for all module projects, or customize the migration options for each type of module project on the following pages.
-Migrate_Project_From_Version_EJB_=Migrate project from version level J2EE 1.2 (EJB 1.x) to J2EE 1.3 (EJB 2.x)
-EJB_Module_Migration_=EJB Module Migration
-Select_the_EJB_projects_to_be_migrated_=Select the EJB projects to be migrated. The project structures migration is optional.
-Migrated_CMP_Beans_To_=Migrate CMP 1.x beans to CMP 2.x beans
-Add_Local_Client_Views_=Add local client views
-Available_Projects_=Projects:
-Selected_Projects_={0} of {1} projects selected.
-Selected_Beans_Migration_={0} of {1} beans selected.
-Application_Client_Projects_=Application Client Projects:
-Connector_Projects_=Connector Projects:
-Select_The_Connector_Projects_=Select the connector projects to be migrated. The project structure migration is optional.
-Select_The_Application_Client_Projects_=Select the application client projects to be migrated. The project structure migration is optional.
-WEB_MIGRATE_WIZARD_TITLE=Web Projects:
-WEB_MIGRATE_WIZARD_DESCRIPTION=Select the web projects to be migrated. The project structure migration is optional.
-Select_the_enterprise_beans_that_will_have_=Select the enterprise beans that will have local client views added.
-Enterprise_Beans_Selection_=Enterprise Beans
-Select_All_Entity_Beans_=Select All Entity Beans
-Select_Required_Beans_=Select Required
-Delete_Remote_Client_Views_=Delete remote client views
-Local_Client_View_Naming_Scheme_=Local client view naming scheme
-Reuse_The_Deleted_Remote_Client_View_=Reuse the deleted remote client view name
-Specify_Suffix_=Specify suffix:
-EJB_Client_View_Example_=For example, EJB bean "Foo" will have local client views named: "Foo{0}" and "Foo{1}Home".
-The_Suffix_Text_Can_Not_Be_=The suffix text cannot be empty.
-A_Project_Must_Be_Selected_=A project must be selected in order to migrate.
-A_Bean_Must_Be_Selected_=A bean must be selected in order to migrate the local client view.
-#moved from mofj2ee.properties
-Stack_trace_of_nested_exce=Stack trace of nested exception:
-ERROR=Error:
-WARNING=Warning:
-INFO=Info:
-DEFAULT_COMPLETED_STATUS_MSG=Migration was completed for {0}.
-DEFAULT_NOT_NEEDED_STATUS_MSG=Migration was not required for {0}.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=Migration was not possible for {0}.
-DEFAULT_ERROR_STATUS_MSG=IWAE0003E Error migrating {0}.
-REMOVED_LOCAL_CLIENT_MSG=Removed local client view for EJB {0}.
-REMOVED_ACCESS_INTENTS_MSG=Removed {0} 1.1 method access intent(s) from CMP bean {1}.
-REMOVED_ISOLATION_LEVELS_MSG=Removed {0} 1.1 method isolation level(s) from CMP bean {1}.
-CONVERTED_FINDER_MSG=Converted finder descripter for {0} in CMP bean {1}. Use the EJB editor to update the query EJB QL.
-UNNAMED_EJB=<Unnamed CMP bean>
-CONVERTED_QUERY_DESCRIPTION=Converted from IBM version 1.1 extensions.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=Migrated default Datasource binding to a default CMP Connection Factory binding for EJB JAR \"{0}\".
-MIGRATED_DEFAULT_DATASOURCE_MSG=Migrated default Datasource binding to a default CMP Connection Factory binding for EJB JAR.
-J2EE_VERSION_NULL_ERROR=Unable to get J2EE version of object because it is not contained by a document.
-J2EE_VERSION_PROXY_ERROR=Unable to get J2EE version of referenced object because the proxy cannot be resolved. Check the ids in the deployment descriptor files. HREF = {0}.
-#moved from j2eecreation.properties
-J2EE_PROJECT_MIGRATION_TITLE_UI_=J2EE Project Migration
-ENTERPRISE_APPLICATIONS_UI_=Enterprise Applications
-WIZ_BAN_DESC_UI_=Select the {0} projects to be migrated. The project structure migration is optional.
-ENTERPRISE_APP_PROJECTS_UI_=Enterprise application projects:
-MIGRATE_J2EE_SPEC_UI_=Migrate project from version level J2EE 1.2 to J2EE 1.3
-MIGRATE_EJB_SPEC_UI_=Migrate project from version level EJB 1.1 to EJB 2.0
-MIGRATE_MODULE_PROJECTS_UI_=Migrate module projects
-APPLICATION_CLIENTS_UI_=Application Clients
-APPLICATION_CLIENT_PROJECTS_UI_=Application client projects:
-ENTERPRISE_BEANS_BAN_UI_=Enterprise Beans
-EJB_PROJECTS_UI_=EJB projects:
-ADD_LOCAL_CLIENT_VIEWS_CHECK_UI_=Add local client views
-MIGRATE_CMP_BEANS_UI_=Migrate CMP 1.1 beans to CMP 2.0 beans
-ADD_LOCAL_CLIENT_VIEWS_BAN_UI_=Add Local Client Views
-SELECT_EJB_CLIENT_VIEWS_UI_=Select the enterprise beans that will have local client views added.
-ENTERPRISE_BEANS_LIST_UI_=Enterprise beans:
-DELETE_REM_CLIENT_VIEWS_UI_=Delete remote client views
-LOCAL_CLIENT_VIEW_SCHEME_UI_=Local client view naming scheme:
-REUSE_DELETED_CLIENT_VIEW_NAME_UI_=Reuse the deleted remote client view name
-SPECIFY_SUFFIX_UI_=Specify suffix:
-SUFFIX_EXAMPLE_UI_=(For example, enterprise bean \'foo\' will have local client views named: \'fooLocal\' and \'fooLocalHome\'.)
-MIGRATION_SUCCESS_REPORT_UI_=Migration finished successfully.
-MIGRATION_WARNINGS_REPORT_UI_=Migration finished with warnings; see log files for details.
-MIGRATION_ERRORS_REPORT_UI_=Migration finished with errors; see log files for details.
-PROJECT_STRUCTURE_SUCCESS_UI_=Project structure migration successful: {0}.
-PROJECT_STRUCTURE_FAILED_UI_=Project structure migration failed: {0}.
-PROJECT_NOT_NEED_MIGRATION_UI_=Project structure did not need migration: {0}.
-J2EE_VERSION_SUCCESS_UI_=J2EE version level migration successful: {0}.
-J2EE_VERSION_FAILED_UI_=J2EE version level migration failed: {0}.
-J2EE_VERSION_NOT_NEED_MIGRATION_UI_=J2EE version level did not need migration: {0}.
-LOCAL_CLIENT_ADD_SUCCESS_UI_=Local client views added successfully: {0}.
-LOCAL_CLIENT_ADD_FAILED_UI_=Local client views failed on add: {0}.
-LOCAL_CLIENT_VIEWS_EXIST_UI_=Local client views already exist: {0}.
-REMOTE_CLIENT_DELETE_SUCCESS_UI_=Remote client views deleted successfully: {0}.
-REMOTE_CLIENT_DELETE_FAILED_UI_=Remote client views failed on delete: {0}.
-REMOTE_CLIENT_VIEWS_NOT_EXIST_UI_=Remote client views did not exist: {0}.
-JAR_11_IMPORT_20_UI_=The 1.1 JAR is being imported into an EJB 2.0 module. The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-CMP_11_IMPORT_20_UI_=The following CMP 1.1 beans are being imported into an EJB 2.0 module. The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-OLD_PROJECT_STRUCTURE_UI_=The J2EE project {0} has an old project structure, and should be migrated.
-PROJECT_MUST_BE_SELECTED_UI_=A {0} project must be selected.
-ENTERPRISE_APPLICATION_UI_=enterprise application
-APPLICATION_CLIENT_UI_=application client
-EJB_UI_=EJB
-WEB_UI_=WEB
-EJB_MUST_BE_SELECTED_UI_=An enterprise bean must be selected.
-MIGRATE_UI_=Migrate...
-MIGRATE_J2EE_PROJECTS_UI_=Migrate J2EE Projects...
-OPEN_J2EE_MIGRATION_WIZARD_UI_=Open J2EE Migration Wizard...
-MIGRATING_PROJECT_STRUCTURES_UI_=Migrating project structure...
-MIGRATING_J2EE_VERSION_UI_=Migrating project J2EE version level...
-ADDING_LOCAL_CLIENT_VIEWS_UI_=Adding local client views...
-DELETING_REMOTE_CLIENT_VIEWS_UI_=Deleting remote client views...
-MIGRATION_NOT_NEEDED_REPORT=Migration was not needed for the selected items.
-MIGRATION_NOT_POSSIBLE_REPORT=Migration was not possible for the selected items.
-SOURCE_FOLDER_RENAME_FAILED=Unable to rename the Java source folder {0}.
-SOURCE_FOLDER_RENAME_SKIPPED=The Java source folders are not renamed when there is more than one source folder.
-WEBCONTENT_FOLDER_RENAME_FAILED=Unable to rename the web content folder {0}.
-WEBCONTENT_FOLDER_RENAME_SKIPPED=The web content folder {0} not renamed.
-WEBPROJECT_VERSION_MIGRATE_FAILED=Unable to migrate the web project version.
-ABS_PATHS_APP_EXT_REMOVED=Absolute paths were removed from the application extensions file in enterprise application project {0}.
-PROJECT_REFERENCES_UPDATED=Project references were updated in enterprise application project {0}.
-PROJECT_CLASSPATH_UPDATED=Project Java build path was updated for project {0}.
-FAILED_MIGRATING_IMPORTED_CLASSES=Unable to migrate the imported_classes JAR file. Exception: {0}
-EXTRACTED_IMPORTED_CLASSES=Imported classes were extracted from file {0}.
-IMPORTED_CLASSES_FILE_DELETED=Imported classes file {0} was deleted.
-BACKEND_MIGRATION_FAILED=Unable to migrate the Map and Schema file structure in project {0}
-BINARY_MIGRATION_FAILED=Unable to migrate binary project {0}.
-COMPLETED_BACKEND_MIG=The backend (Map and Schema) meta-data of the {0} project migrated successfully.
-NOT_NEEDED_DEPLOYMENT_DESC_MIG=The deployment descriptor was not found in the project {0}.
-NOT_NEEDED_BACKEND_MIG=The old backend (Map and Schema) structure was not found in the project {0}.
-MIGRATION_COMPLETE=Migration Complete
-MIGRATION_ERRORS=Migration Errors
-MIGRATION_NOT_NEEDED=Migration Not Needed
-CONFIRMATION_TITLE=Confirm Migration
-OPEN_EDITORS_TITLE=Open Editors
-CONFIRM_MIGRATE_PROJECT_STRUCTURE=This will migrate the project structure for the selected items to the latest format. Continue?
-CONFIRM_MIGRATE_J2EE_13=This will migrate the project structure for the selected items if necessary, and migrate the J2EE version of the selected items from 1.2 to 1.3. Continue?
-INFORM_OPEN_EDITORS=Open editors exist in the workbench. Please close all editors before running migration.\n\nDo you want to close all editors and continue migration?
-WEBCONTENT_LIBPATH_UPDATE_FAILED=Unable to remove JAR file from classpath.
-FAILED_DEPLOY_DELETE=Failed deleting deploy code in {0} project.
-COMPLETED_DEPLOY_DELETE=Completed delete of deploy code in {0} project.
-FAILED_LOCAL_CLIENT_CREATE=Failed creating local client view for {0}.
-COMPLETED_LOCAL_CLIENT_CREATE=Completed creation of a local client view for {0}.
-COMPLETED_CMP20_CODEGEN=Completed CMP 2.0 code generation in {0} project.
-LOCAL_CLIENT_NOT_NEEDED=A local client view was not created since one already exists for {0}.
-INVALID_SELECTION_TITLE=Invalid Selection
-INFORM_INVALID_J2EE_SELECTION=One or more J2EE 1.4 specification projects have been selected for migration that is not valid.\nOnly J2EE 1.2 or 1.3 specification projects can be migrated.
-INFORM_PROPER_SELECTION=Selection must be one enterprise application project or any combination of EJB, web, and application client module projects.
-REQUIRED_CLIENT_VIEW_TITLE=Client View Required
-CONFIRM_CLIENT_VIEW_REQUIRED=The following beans are required to have client views because of inheritance or relationship rules. These beans will be automatically selected and client views will be generated.
-FILES_OUT_OF_SYNC=Cannot migrate because some resources are out-of-sync with the file system in project {0}. Refresh the project and try again.
-SERVER_TARGET_SETTING_FAILED_UI_=Setting of target server failed: {0}.
-RemoveCompatibilityActionDelegate_UI_0=Warninig
-RemoveCompatibilityActionDelegate_UI_1=Continue Removing Backward Compatibility from Projects?
-JaxrpcmapSpecificationMigrator_UI_1=jaxrpc mapping migration completed successfully
-JaxrpcmapSpecificationMigrator_UI_2=Migration of jaxrpc mapping descriptor is not possible because the module root folder was not found.
-WebServicesClientSpecificationMigrator_UI_0=Web services client migration completed successfully.
-WebServicesClientSpecificationMigrator_UI_1=A valid project is required for Webservices Migration
-WebServicesClientSpecificationMigrator_UI_2=Could not locate Webservices.
-WebServicesClientSpecificationMigrator_UI_3=There is no webservices client file to migrate.
-WebServicesSpecificationMigrator_UI_0=Web services migration completed successfully.
-WebServicesSpecificationMigrator_UI_1=No Web services migration was required
-J2EEProjectStructureMigrationOperation_UI_4=Migration of Web Project version successful
-J2EEProjectStructureMigrationOperation_UI_0="Project {0} -- Renamed \'{1} \' to \'{2}\'.
-J2EEProjectStructureMigrationOperation_UI_1=Problem renaming java source: {0}.
-J2EEProjectStructureMigrationOperation_UI_2="Problem renaming web content: {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.web/.classpath b/plugins/org.eclipse.jst.j2ee.web/.classpath
deleted file mode 100644
index d2d07c1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="web/"/>
- <classpathentry kind="src" path="war-validation/"/>
- <classpathentry kind="src" path="webedit/"/>
- <classpathentry kind="src" path="webproject/"/>
- <classpathentry kind="src" path="property_files/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.cvsignore b/plugins/org.eclipse.jst.j2ee.web/.cvsignore
deleted file mode 100644
index d369c9a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee.web/.project b/plugins/org.eclipse.jst.j2ee.web/.project
deleted file mode 100644
index eb96e2c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.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.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
deleted file mode 100644
index 193077e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.j2ee.internal.web.archive.operations,
- org.eclipse.jst.j2ee.internal.web.classpath,
- org.eclipse.jst.j2ee.internal.web.deployables,
- org.eclipse.jst.j2ee.internal.web.jfaces.extension,
- org.eclipse.jst.j2ee.internal.web.operations,
- org.eclipse.jst.j2ee.internal.web.plugin,
- org.eclipse.jst.j2ee.internal.web.providers,
- org.eclipse.jst.j2ee.internal.web.util,
- org.eclipse.jst.j2ee.internal.web.validation,
- org.eclipse.jst.j2ee.web.componentcore.util,
- org.eclipse.jst.j2ee.web.datamodel.properties,
- org.eclipse.jst.j2ee.web.project.facet
-Require-Bundle: org.eclipse.jst.j2ee,
- org.eclipse.core.runtime,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jem.workbench,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee.core,
- org.eclipse.wst.validation,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit,
- org.eclipse.jem.workbench,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.emf.codegen,
- org.eclipse.wst.web,
- org.eclipse.jface,
- org.eclipse.jst.common.annotations.controller,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.util,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.common.project.facet.core
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.web/about.html b/plugins/org.eclipse.jst.j2ee.web/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/build.properties b/plugins/org.eclipse.jst.j2ee.web/build.properties
deleted file mode 100644
index a6a23c6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/build.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- templates/,\
- .,\
- META-INF/,\
- about.html,\
- schema/
-jars.compile.order = .
-source.. = web/,\
- war-validation/,\
- webedit/,\
- webproject/,\
- property_files/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.web/component.xml b/plugins/org.eclipse.jst.j2ee.web/component.xml
deleted file mode 100644
index e08c4bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.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.jst.j2ee.web"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.web" fragment="false"/><plugin id="org.eclipse.jst.servlet.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif b/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif
deleted file mode 100644
index e12289b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif b/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif
deleted file mode 100644
index 8450a6f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif
deleted file mode 100644
index 9f75eb0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif
deleted file mode 100644
index 5b64c4d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif b/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif
deleted file mode 100644
index 119dccc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif b/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif
deleted file mode 100644
index 811b21b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif b/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif
deleted file mode 100644
index 811b21b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif b/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif
deleted file mode 100644
index 1845563..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif
deleted file mode 100644
index 3c8a0ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/field.gif b/plugins/org.eclipse.jst.j2ee.web/icons/field.gif
deleted file mode 100644
index 06d38f5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/field.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif b/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif
deleted file mode 100644
index 0712d1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif
deleted file mode 100644
index 8f2e36b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif b/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif b/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif
deleted file mode 100644
index e3fcbb1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif
deleted file mode 100644
index 5f2f2d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif
deleted file mode 100644
index 7a479e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index 225e813..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 45ca182..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index 346fc49..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 1df6f5f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index 5181241..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif
deleted file mode 100644
index 5397c66..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif
deleted file mode 100644
index 34229a7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif
deleted file mode 100644
index 256e5a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif
deleted file mode 100644
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif
deleted file mode 100644
index 3d75cb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif
deleted file mode 100644
index 52bac36..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif
deleted file mode 100644
index fc66e9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif
deleted file mode 100644
index 400e049..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif
deleted file mode 100644
index 4176871..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif
deleted file mode 100644
index e336513..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif
deleted file mode 100644
index d528595..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif
deleted file mode 100644
index 43e86db..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif
deleted file mode 100644
index e0dd2d8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif
deleted file mode 100644
index 23f12fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif
deleted file mode 100644
index 30f0c48..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif
deleted file mode 100644
index 5915591..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif
deleted file mode 100644
index 53500da..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif
deleted file mode 100644
index ef30288..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif
deleted file mode 100644
index 17633ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif
deleted file mode 100644
index bf043f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif
deleted file mode 100644
index 4c54bf1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif
deleted file mode 100644
index 49873f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif
deleted file mode 100644
index d528595..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif
deleted file mode 100644
index 6912def..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif
deleted file mode 100644
index f507742..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif
deleted file mode 100644
index e3539d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif
deleted file mode 100644
index ef30288..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif
deleted file mode 100644
index 3764249..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif
deleted file mode 100644
index 9f779e4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif
deleted file mode 100644
index 5fd9c94..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif
deleted file mode 100644
index bda81f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif
deleted file mode 100644
index ababbca..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif
deleted file mode 100644
index 56c8c3b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif
deleted file mode 100644
index efb2bd4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif
deleted file mode 100644
index 71c8182..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif
deleted file mode 100644
index ff7c242..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 72944e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif
deleted file mode 100644
index 0bbebe9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF b/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF
deleted file mode 100644
index 6331e65..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif b/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif b/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif
deleted file mode 100644
index 997b50c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif
deleted file mode 100644
index 8a63675..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/key.gif b/plugins/org.eclipse.jst.j2ee.web/icons/key.gif
deleted file mode 100644
index 03af38b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/key.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif
deleted file mode 100644
index c3e27cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif
deleted file mode 100644
index b647758..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif
deleted file mode 100644
index 6d137cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif
deleted file mode 100644
index 8435ec7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif
deleted file mode 100644
index d155408..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif
deleted file mode 100644
index b5e8b3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif
deleted file mode 100644
index c495ac8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif
deleted file mode 100644
index c4a9d21..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif
deleted file mode 100644
index 14009e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif
deleted file mode 100644
index b26c71d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif
deleted file mode 100644
index 25dc9c8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif
deleted file mode 100644
index b8797f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/war.gif b/plugins/org.eclipse.jst.j2ee.web/icons/war.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/war.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif
deleted file mode 100644
index e2b751d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif b/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif
deleted file mode 100644
index acba7cb..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif
deleted file mode 100644
index 7646c44..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif
deleted file mode 100644
index fec24d6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif
deleted file mode 100644
index 83f9165..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif
deleted file mode 100644
index 71bf43c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif
deleted file mode 100644
index 9fbce05..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif
deleted file mode 100644
index a9045c1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif b/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif
deleted file mode 100644
index d7dab83..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif b/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif
deleted file mode 100644
index f4c7132..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif b/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif
deleted file mode 100644
index 1496cba..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.properties b/plugins/org.eclipse.jst.j2ee.web/plugin.properties
deleted file mode 100644
index 27e07a6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.properties
+++ /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
-###############################################################################
-war_validator_UI_=War Validator
-WEB_FACET_LABEL=Dynamic Web Module
-WEB_FACET_DESCRIPTION=Enables the project to be deployed as a dynamic web module.
-WEB_FACET_TEMPLATE_LABEL=Dynamic Web Project
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
deleted file mode 100644
index ad05e85..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!--============================-->
-<!-- Web JSFaces File URL extension -->
-<!--============================-->
-
- <extension-point id="fileURL" name="FileURL" schema="schema/fileURL.exsd"/>
-
-
-<!--============================-->
-<!-- Web Validator -->
-<!--============================-->
- <extension
- id="WarValidator"
- name="%war_validator_UI_"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <projectNature
- id="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </projectNature>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="web.xml">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jar">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter=".websettings">
- </filter>
- <helper
- class="org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper">
- </helper>
- <dependentValidator
- depValValue="true">
- </dependentValidator>
- <run
- class="org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator">
- </run>
- </validator>
- </extension>
-
- <extension
- id="WebModuleExtension"
- name="WebModuleExtension"
- point="org.eclipse.jst.j2ee.EARModuleExtension">
- <earModuleExtension
- extensionClass="org.eclipse.jst.j2ee.internal.web.plugin.WebModuleExtensionImpl">
- </earModuleExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.web.providers.WebapplicationItemProviderAdapterFactory"
- packageURI="webapplication.xmi"
- id="org.eclipse.jst.j2ee.webapplication.provider.WebapplicationItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.web.providers.JspItemProviderAdapterFactory"
- packageURI="jsp.xmi"
- id="org.eclipse.jst.j2ee.internal.jsp.provider.JspItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
-
-<!-- =========================================================== -->
-<!-- Web Tag set definitions for XDoclet -->
-<!-- =========================================================== -->
-
- <extension
- id="WebTagSets"
- point="org.eclipse.jst.common.annotations.controller.AnnotationTagSet">
- <AnnotationTagSet
- name="web">
- </AnnotationTagSet>
- </extension>
-
- <extension
- id="WebAnnotationInfo"
- point="org.eclipse.jst.common.annotations.controller.AnnotationTagInfo">
- <AnnotationTagInfo
- tagSet="web"
- tagName="filter"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="display-name">
- </attrib>
- <attrib
- name="small-icon">
- </attrib>
- <attrib
- name="large-icon">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="filter-init-param"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="value">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="filter-mapping"
- scope="type">
- <attrib
- name="url-pattern">
- </attrib>
- <attrib
- name="servlet-name">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="servlet"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="display-name">
- </attrib>
- <attrib
- name="icon">
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="load-on-startup">
- </attrib>
- <attrib
- name="run-as">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="servlet-init-param"
- multiplicity="*"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="value">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="servlet-mapping"
- multiplicity="*"
- scope="type">
- <attrib
- use="required"
- name="url-pattern">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="listener"
- scope="type">
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="security-role-ref"
- scope="type">
- <attrib
- use="required"
- name="role-name">
- </attrib>
- <attrib
- use="required"
- name="role-link">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="resource-env-ref"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- use="required"
- name="type">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="resource-ref"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- use="required"
- name="type">
- </attrib>
- <attrib
- use="required"
- name="auth">
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="scope">
- </attrib>
- <attrib
- name="jndi-name">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="security-role"
- scope="type">
- <attrib
- use="required"
- name="role-name">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="env-entry"
- scope="type">
- <attrib name="name" use="required">
- </attrib>
- <attrib name="description"/>
- <attrib name="type" type="enum">
- <enumValues value="java.lang.Boolean"/>
- <enumValues value="java.lang.Byte"/>
- <enumValues value="java.lang.Character"/>
- <enumValues value="java.lang.String"/>
- <enumValues value="java.lang.Short"/>
- <enumValues value="java.lang.Integer"/>
- <enumValues value="java.lang.Long"/>
- <enumValues value="java.lang.Float"/>
- <enumValues value="java.lang.Double"/>
- </attrib>
- <attrib name="value"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="ejb-ref"
- scope="type">
- <attrib name="name" use="required"/>
- <attrib name="type" type="enum" use="required">
- <enumValues value="Entity"/>
- <enumValues value="Session"/>
- </attrib>
- <attrib name="home" use="required"/>
- <attrib name="remote" use="required"/>
- <attrib name="link"/>
- <attrib name="description"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="ejb-local-ref"
- scope="type">
- <attrib name="name" use="required"/>
- <attrib name="type" type="enum" use="required">
- <enumValues value="Entity"/>
- <enumValues value="Session"/>
- </attrib>
- <attrib name="home" use="required"/>
- <attrib name="local" use="required"/>
- <attrib name="link"/>
- <attrib name="description"/>
- </AnnotationTagInfo>
- </extension>
-
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.web"
- factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
- <editModelResource
- autoload="false"
- URI="WEB-INF/web.xml"/>
- </editModel>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.artifactedit">
- <artifactedit
- typeID="jst.web"
- class="org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit">
- </artifactedit>
- </extension>
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="jst.web.builder"
- providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider"/>
- </extension>
-
- <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
- <classpathContainerInitializer
- class="org.eclipse.jst.j2ee.internal.web.classpath.WebAppContainerInitializer"
- id="org.eclipse.jst.j2ee.internal.web.container"/>
- </extension>
-
- <!-- Project Facets -->
-
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.web">
- <label>%WEB_FACET_LABEL</label>
- <description>%WEB_FACET_DESCRIPTION</description>
- </project-facet>
-
- <project-facet-version facet="jst.web" version="2.2">
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.web" version="2.3">
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.web" version="2.4">
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <action type="install" facet="jst.web" version=">=2.2,<=2.4">
- <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/>
- </action>
-
-<!-- <action type="version-change" facet="jst.web" version=">=2.2,<=2.4">
- <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetVersionChangeDelegate"/>
- </action> -->
-
- <action type="runtime-changed" facet="jst.web" version=">=2.2,<=2.4">
- <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetRuntimeChangedDelegate"/>
- </action>
-
- <template id="template.jst.web">
- <label>%WEB_FACET_TEMPLATE_LABEL</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- </template>
-
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml
deleted file mode 100644
index 4978da7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.web"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/ProjectSupport.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/ProjectSupport.properties
deleted file mode 100644
index dcfa881..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/ProjectSupport.properties
+++ /dev/null
@@ -1,47 +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
-###############################################################################
-Creating_Web_Project____UI_=Creating Web Project...
-The_path_for_the_links_sta_EXC_=IWAE0001E The path for the links state file is incorrect
-Syntax_Error_in_the_links_UI_=Syntax Error in the links state file
-Error_while_saving_links_s_EXC_=IWAE0002E Error while saving links state file
-Operation_failed_due_to_SA_ERROR_=IWAE0003E Operation failed due to SAX error:
-Operation_failed_due_to_IO_ERROR_=IWAE0004E Operation failed due to IO error:
-Operation_failed_due_to_Co_ERROR_=IWAE0005E Operation failed due to Core error:
-Operation_failed_due_to_Ja_ERROR_=IWAE0006E Operation failed due to Java Model error:
-_1concat_EXC_=IWAE0007E Error occured getting web.xml: {0}
-Error_importing_Module_Fil_EXC_=IWAE0008E Error importing Module File
-Cannot_clone_TaglibInfo_1_EXC_=IWAE0009E Cannot clone TaglibInfo
-Could_not_read_TLD_15=Could not read TLD
-File_Serving_Enabler_7=File Serving Enabler
-Auto_Generated___File_Enabler_9=Auto Generated - File Enabler
-Generated_by_Web_Tooling_23=Generated by Web Tooling
-Not_a_web_project_29=Not a web project
-A_web_project_must_be_open_and_must_exist_for_properties_to_be_edited_30=A web project must be open and must exist for properties to be edited
-Invalid_Servlet_Level_set_on_WebNature_3_EXC_=IWAE0010E Invalid Servlet Level set on WebNature
-Context_Root_cannot_be_empty_2=Context Root cannot be empty
-Names_cannot_begin_or_end_with_whitespace_5=Names cannot begin or end with whitespace
-The_character_is_invalid_in_a_context_root=The character {0} is invalid in a context root.
-Folder_name_cannot_be_empty_2=Folder name cannot be empty
-Folder_names_cannot_be_equal_4=Folder names cannot be equal
-Folder_name_cannot_be_the_same_as_Java_source_folder_5=Folder name cannot be the same as Java source folder
-Folder_name_cannot_be_the_same_as_Java_class_folder_6=Folder name cannot be the same as Java class folder
-Folder_name_is_not_valid=Folder name {0} is not valid
-Could_not_rename_____2=Could not rename: ''{0}'' already exists.
-Sync_WLP_Op=Synchronizing Web Library Projects\n\t
-Target_Update_Op=Updating target server for {0}\n\t
-_24concat_INFO_=IWAE0011I .startupOnInitialize() for
-Sychronize_Class_Path_UI_=Sychronize Class Path
-Catalog_Lib_Directory__UI_=Catalog Lib Directory:
-Update_ClassPath__UI_=Update ClassPath:
-Catalog_Lib_Directory__UI_=Catalog Lib Directory:
-Update_ClassPath__UI_=Update ClassPath:
-Set_ClassPath__UI_=Set ClassPath:
-UNABLE_TO_LOAD_MODULE_ERROR_=UNABLE_TO_LOAD_MODULE_ERROR_
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/warvalidation.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/warvalidation.properties
deleted file mode 100644
index 4ecfe01..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/warvalidation.properties
+++ /dev/null
@@ -1,252 +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
-###############################################################################
-#This properties file hold all the externalised strings for eTools WAR Validation project
-# Validation project
-#
-# Messages should be according to the format at:
-# http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-# MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-# CHKJ (IBM WebSphere Validation)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/warvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-
-# 2-July-2001:
-# This file has been tested using the ProcessMsgFile tool, written by
-# Hany Salem and owned by Dennis Hebert. Any future changes should
-# also be verified using this tool. Please contact Dennis
-# (hebert@us.ibm.com or T/L 543-2520) for more information.
-#
-
-# --------------------------------
-ERROR_WAR_VALIDATION_FAILED=CHKJ3000E: WAR Validation Failed: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Duplicate security role named {0}.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: The JSP file, {0}, for the servlet \"{1}\" is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: The <small-icon> file, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: The <large-icon> file, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: The servlet mapping \"{0}\" refers to a servlet that is not defined.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Empty welcome file list entry.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: Welcome file {0} is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: The Tag Library Descriptor File, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: Missing or invalid WAR file.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: The filter mapping \"{0}\" refers to a filter that is not defined.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: Welcome Files cannot begin or end with a /.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Parsing Error: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Deployment Descriptor Parsing error.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Deployment Descriptor Parsing error.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: Cannot open the deployment descriptor. Validation cannot complete.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: The URL Mapping \"{0}\" is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Invalid Security role-link: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: Invalid HTTP method: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Invalid Transport Gurarantee. Valid values are \"NONE\", \"INTEGRAL\", or \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: The jsp-file \"{0}\" referenced by servlet {1} must be a full absolute path.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Web Project: {0} is mapped to an invalid Context root: {1} in EAR Project: {2}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: The Location of the Error Page Must Begin with a /.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Invalid Security role-name: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: Invalid auth method. Valid values are: \"BASIC\", \"DIGEST\", \"FORM\", or \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E: Authentication method is {0}. The form-login-config values will be ignored unless using FORM authentication method.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E: Resource ref {0} must contain res-auth of "SERVLET" or "CONTAINER".
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E: Resource ref {0} must contain res-auth of "Application" or "Container".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E: \"Application\" is not a valid value for.res-auth in a 2.2 level deployment descriptor. Use \"SERVLET\" instead.
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E: \"SERVLET\" is not a valid value for.res-auth in a 2.2 level deployment descriptor. Use \"Application\" instead.
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: Invalid Exception Type {0}. The exception type must contain a fully qualified class name of a Java exception type.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: Duplicate URL mapping {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Duplicate Servlet Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: Session Timeout is not valid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Duplicate Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: Empty Entry {0}.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: Duplicate Filter Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: Duplicate ejb-ref element named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing. It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: ERROR EAR UNCONTAINED MODULE FILE EXCEPTION
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: Unknown Error Code: {0}. error-code must contain a valid HTTP status code.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: Invalid res-sharing-scope; valid values are \"Shareable\" or \"Unshareable\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: Invalid Environment Entry Type. Valid values are \"java.lang.TYPE\", where TYPE is one of the following: Boolean, Byte, Character, String, Short, Integer, Long, Float, or Double."
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Missing Web Library Project ({0}). Check the properties of this project to fix this problem.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: The Web Library Project JAR ({0}) conflicts with an actual JAR in the WEB-INF/lib directory.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: The target server of the Web Library Project ({1}) does not match that of this Web Project ({0}). Run validation on the Web Project if you think that is not the case.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type must be 'Entity' or 'Session'.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=of Type Security Role Name
-Web_Archive_Validator_8=Web Archive Validator
-of_Type_Role_Name_19=of Type Role Name
-of_Type_Parameter_Name_25=of Type Parameter Name
-of_Type_Parameter_Value_26=of Type Parameter Value
-of_Type_Parameter_Name_32=of Type Parameter Name
-of_Type_Parameter_Value_33=of Type Parameter Value
-of_Type_Parameter_Name_39=of Type Parameter Name
-of_Type_Parameter_Value_40=of Type Parameter Value
-of_Type_ejb-ref-name_44=of Type ejb-ref-name
-of_Type_Error_Location_47=of Type Error Location
-of_Type_Error_Location_49=of Type Error Location
-of_Type_Mime_Extension_54=of Type Mime Extension
-of_Type_Mime_Type_55=of Type Mime Type
-of_Type_Mime_Extension___56=of Type Mime Extension:
-of_Type_Web_Resource_Collection_64=of Type Web Resource Collection
-of_Type_Filter_Name_66=of Type Filter Name
-Invalid_URL_70=Invalid URL
-Invalid_URL_75=Invalid URL
-of_Type_Servlet_Name_77=of Type Servlet Name
-of_Type_Taglib_80=of Type Taglib
-of_Type_TagLib___81=of Type TagLib:
-of_Type_Web_Resource_Name_84=of Type Web Resource Name
-of_Type_Welcome_File_Name__87=of Type Welcome File Name
-of_Type_Env_Entry_Name___88=of Type Environment Entry Name
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties
deleted file mode 100644
index 6cdaf46..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties
+++ /dev/null
@@ -1,89 +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
-###############################################################################
-ERR_JAR_NAME_EMPTY=The JAR name cannot be empty.
-ERR_JAR_NAME_EXIST=The JAR name already exists.
-ERR_JAVA_PROJECT_NAME_EMPTY=The Java project name cannot be empty.
-ERR_JAVA_PROJECT_NAME_EXIST=The Java project name already exists.
-ERR_DUPLICATED_INIT_PARAMETER=Duplicated init parameters.
-ERR_DUPLICATED_URL_MAPPING=Duplicated URL mappings.
-
-ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY=The servlet mapping url pattern cannot be empty.
-ERR_SERVLET_MAPPING_URL_PATTERN_EXIST=The servlet mapping url pattern "{0}" already exists.
-KEY_3=The filter mapping url pattern cannot be empty.
-KEY_4=The filter mapping url pattern "{0}" already exists.
-KEY_5=The filter mapping servlet cannot be empty.
-KEY_6=The filter init param name cannot be empty.
-ERR_FILTER_PARAMETER_NAME_EXIST=The filter initialization parameter name already exists.
-ERR_FILTER_MAPPING_SERVLET_EXIST=The filter mapping servlet "{0}" already exists.
-ERR_FILTER_MAPPING_SERVLET_DISPATCHER_TYPES_EMPTY=The dispatcher types cannot be empty.
-ERR_DISPLAY_NAME_EMPTY=The name cannot be empty.
-ERR_SERVLET_NAME_EXIST=The servlet name already exists.
-ERR_SERVLET_DISPLAY_NAME_EXIST=The servlet display name already exists.
-ERR_SERVLET_CLASS_NAME_USED=The class is already associated with other servlet.
-ERR_SERVLET_JAVA_CLASS_NAME_INVALID=Cannot use Servlet as the servlet class name.
-ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY=The servlet mapping url pattern cannot be empty.
-ERR_SERVLET_MAPPING_URL_PATTERN_EXIST=The servlet URL mapping pattern already exists.
-ERR_SERVLET_MAPPING_SERVLET_NOT_EXIST=The servlet does not exist.
-ERR_SERVLET_PARAMETER_NAME_EMPTY=The servlet initialization parameter name cannot be empty.
-ERR_SERVLET_PARAMETER_NAME_EXIST=The servlet initialization parameter name already exists.
-ERR_SERVLET_PARAMETER_VALUE_EMPTY=The servlet initialization parameter value cannot be empty.
-ERR_SERVLET_PARAMETER_VALUE_EXIST=The servlet initialization parameter value already exists.
-ERR_SERVLET_ROLE_REF_NAME_EMPTY=The servlet security role reference name cannot be empty.
-ERR_SERVLET_ROLE_REF_NAME_EXIST=The servlet security role reference name already exists.
-ERR_SERVLET_ROLE_LINK_EMPTY=The servlet security role reference link cannot be empty.
-
-ERR_FILTER_DISPLAY_NAME_EXIST=The filter name already exists.
-ERR_FILTER_CLASS_NAME_USED=The class is already associated with other filter.
-ERR_FILTER_CLASS_NAME_INVALID=Cannot use Filter as the filter class name.
-ERR_LISTENER_DISPLAY_NAME_EXIST=The listener name already exists.
-ERR_LISTENER_CLASS_NAME_USED=The class is already associated with other listener.
-ERR_LISTENER_CLASS_NAME_INVALID=Cannot use Listener as the listener class name.
-
-ERR_PAGE_ENCODING_EMPTY=The page encoding cannot be empty.
-ERR_PAGE_ENCODING_EXIST=The page encoding already exists.
-ERR_URL_PATTERN_EXIST=The URL pattern exists.
-ERR_INCLUDE_PRELUDES_EXIST=The include preludes exists.
-ERR_INCLUDE_CODAS_EXIST=The include Codas exists.
-ERR_SECURITY_CONSTRAINT_NAME_EMPTY=The security constraint name cannot be empty.
-ERR_SECURITY_CONSTRAINT_NAME_EXIST=The security constraint name already exists.
-ERR_CONTEXT_PARAMETER_NAME_EMPTY=The context parameter name cannot be empty.
-ERR_CONTEXT_PARAMETER_NAME_EXIST=The context parameter name already exists.
-ERR_RESOURCE_NAME_EMPTY=The web resource name cannot be empty.
-ERR_RESOURCE_NAME_EXIST=The web resource name already exists.
-ERR_URL_PATTERNS_EMPTY=The URL patterns cannot be empty.
-ERR_MIME_MAPPING_EXTENSION_EMPTY=The Mime mapping extension cannot be empty.
-ERR_MIME_MAPPING_EXTENSION_EXIST=The Mime mapping extension already exists.
-ERR_WELCOME_PAGE_EMPTY=The Welcome file name cannot be empty.
-ERR_WELCOME_PAGE_EXIST=The Welcome file name already exists in Welcome File List.
-ERR_ENV_ENTRY_NAME_EMPTY=The environment entry name cannot be empty.
-ERR_ENV_ENTRY_NAME_EXIST=The environment entry name already exists.
-ERR_ERROR_CODE_EMPTY=The error code cannot be empty.
-ERR_ERROR_CODE_MUST_BE_3_DIGITS=The error code must be three digits.
-ERR_ERROR_PAGE_LOCATION_EMPTY=The error page location cannot be empty.
-ERR_ERROR_PAGE_LOCATION_EXIST=The error page location already exists.
-ERR_ERROR_PAGE_LOCATION_MUST_START_WITH_SLASH=The error page location must start with /.
-ERR_EXCEPTION_TYPE_EMPTY=The exception type cannot be empty.
-ERR_EXCEPTION_SECURITY_ID_NO_BEANS=The bean selection can not be empty.
-ERR_EXCEPTION_ROLE_NAME_EMPTY=The role name can not be empty.
-ERR_LOCALE_NAME_EMPTY=The locale cannot be empty.
-ERR_LOCALE_NAME_EXIST=The locale already exists.
-ERR_TAGLIBREF_URL_EMPTY=The tag lib ref URL cannot be empty.
-ERR_TAGLIBREF_URL_EXIST=The tag lib ref URL already exists.
-ERR_MESSAGE_DESTINATION_NAME_EMPTY=The message destination name cannot be empty.
-ERR_MESSAGE_DESTINATION_NAME_EXIST=The message destination name already exists.
-ERR_EXCEPTION_ROLE_NAME_EMPTY=The security role names cannot be empty.
-ERR_EXCEPTION_METHOD_ELEMENT_EMPTY=The method elements cannot be empty.
-ERR_EXCEPTION_METHOD_TRANSACTION_ATTRIBUTES_EMPTY=The method transaction attributes can not be empty.
-ERR_SERVLET_LIST_EMPTY=The list of servlets to be removed cannot be empty.
-ERR_FILTER_LIST_EMPTY=The list of filters to be removed cannot be empty.
-ERR_LISTENER_LIST_EMPTY=The list of listeners to be removed cannot be empty.
-
-WEB_CONT_DESCRIPTION = Web App Libraries
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties
deleted file mode 100644
index 1859b15..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties
+++ /dev/null
@@ -1,937 +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
-###############################################################################
-FILTER_MAPPING=Filter Mapping
-LISTENER=Listener
-Container_Selection_UI_=Folder Selection
-Choose_a_Container__UI_=Choose a Folder:
-Container__UI_=Folder:
-Browse..._UI_=Browse...
-Superclass_selection_UI_=Superclass selection
-Choose_a_superclass_UI_=Choose a superclass
-Add..._UI_=Add...
-Remove_UI_=Remove
-No_packages_to_choose_from_UI_=No packages to choose from.
-Error_EXC_=IWAE0015E Error
-Specify_a_name_and_package_UI_=Create a new Servlet class.
-Which_method_stubs_would_y_UI_=Which method stubs would you like to create?
-__Add_to_web.xml?_UI_=Add to web.xml?
-__Add...___UI_=Add
-__Delete___UI_=Delete
-Cancel_UI_=Cancel
-New_UI_=New
-None_UI_=None
-Create_the_Servlet_Class_UI_=Create the Servlet Class
-Define_the_Servlet_in_the__UI_=Define the Servlet in the Deployment Descriptor (web.xml) File
-Identify_any_information_t_UI_=Identify any information that should be inserted into the Deployment Descriptor (web.xml) file for the servlet.
-Create_Two_Children_UI_=Create Two Children
-Create_Child_UI_=Create Child
-Description_UI_=Description
-2concat_UI_=Create a new child for the selected {0}.
-4concat_UI_=Create a child of type {0} for the selected {1}.
-6concat_UI_=Create {0}
-7concat_UI_=Create two new children for the selected {0}.
-8concat_UI_=Create two new children of type {0} for the selected {1}.
-9concat_UI_=Create Two {0}s
-11concat_UI_=AuthConstraint {0}
-12concat_UI_=ContextParam {0}
-13concat_UI_=ErrorPage {0}
-14concat_UI_=ErrorCodeErrorPage {0}
-15concat_UI_=ExceptionTypeErrorPage {0}
-52concat_UI_=FormLoginConfig {0}
-16concat_UI_=FormLoginConfig {0}
-17concat_UI_=HTTPMethodType {0}
-18concat_UI_={0} = {1}
-21concat_UI_=LoginConfig {0}
-22concat_UI_=MimeMapping {0}
-23concat_UI_=RoleNameType {0}
-24concat=Create a child of type WebResourceCollection for the selected {0}.
-26concat_UI_=Create a child of type InitParam for the selected {0}.
-28concat_UI_=Servlet mapping ({0} -> {1})
-31concat_UI_=SessionConfig {0}
-32concat_UI_=TagLibRef {0}
-33concat_UI_=URLPatternType {0}
-34concat_UI_=UserDataConstraint {0}
-35concat_UI_=Create a child of type ContextParam for the selected {0}.
-37concat_UI_=Create a child of type URLPatternType for the selected {0}.
-38concat_UI_=WebResourceCollection {0}
-40concat_UI_=JSPType {0}
-41concat_UI_=ServletType {0}
-42concat_UI_=Create a child of type WelcomeFile for the selected {0}.
-45concat_ERROR_=IWAE0016E Error writing to web.xml:{0}
-50concat_UI_={0} Change
-New_param_UI_=New param
-value_UI_=value
-New_init_param_UI_=New init param
-(New_Security_Role)_UI_=(New Security Role)
-New_security_role_UI_=New security role
-(New_Servlet)_UI_=(New Servlet)
-packagename.classname_UI_=packagename.classname
-New_servlet_UI_=New servlet
-/url/*_UI_=/url/*
-New_servlet_mapping_UI_=New servlet mapping
-(New_filename)_UI_=(New filename)
-New_welcome_file_UI_=New welcome file
-New_welcome_file_list_UI_=New welcome file list
-Problems_Opening_Editor_ERROR_=IWAE0017E Problems Opening Editor
-Large_Icon_Chooser_Dialog_UI_=Large Icon Chooser Dialog
-Small_Icon_Chooser_Dialog_UI_=Small Icon Chooser Dialog
-Browse..._UI__UI_=Browse...
-Value__UI_=Value:
-Description_UI__UI_=Description
-Error_EXC__ERROR_=IWAE0018E Error
-root_undef_ERROR_=IWAE0019E root undef
-Package__UI_=Package:
-(default)_UI_=(default)
-Servlet_Name__UI_=Servlet Name:
-Superclass__UI_=Superclass:
-Interfaces__UI_=Interfaces:
-Modifiers__UI_=Modifiers:
-Use_Single_Thread_Model_UI_=Use Single Thread Model
-Options__UI_=Options:
-Package_Selection_UI_=Package Selection
-Choose_a_package__UI_=Choose a package:
-Superinterfaces_Selection_UI_=Superinterfaces Selection
-Choose_interfaces_UI_=Choose interfaces
-Create_the_Servlet_Class_UI__UI_=Create the Servlet Class
-Inherited_abstract_methods_UI_=Inherited abstract methods
-Constructors_from_supercla_UI_=Constructors from superclass
-Mappings__UI_=Mappings:
-URL_UI_=URL
-URL__UI_=URL:
-Add_Mapping_UI_=Add Mapping
-Display_Name__UI_=Display name:
-Init_Parameters__UI_=Init Parameters:
-Initialization_parameter_UI_=Initialization parameter
-Value_UI_=Value
-Parameter_Name__UI_=Parameter Name:
-Parameter_Value__UI_=Parameter Value:
-Add_Initialization_Paramet_UI_=Add Initialization Parameter
-OK_UI_=OK
-(default_package)_UI_=(default package)
-Authorized_Roles_UI_=Authorized roles
-Edit..._UI_=Edit...
-(New_web_resource_collecti_UI_=(New web resource collection)
-New_web_resource_collectio_UI_=New web resource collection
-Delete_web_resource_collec_UI_=Delete web resource collection
-Web_Resource_Collection_UI_=Web resource collection
-Web_Resource_Collections_UI_=Web Resource Collections
-New_UI__UI_=Add
-Delete_UI_=Remove
-User_Data_Constraint_UI_=User data constraint
-New_security_constraint_UI_=New security constraint
-Transport_guarentee_change_UI_=Transport guarentee change
-Delete_security_constraint_UI_=Delete security constraint
-Security_constraints_UI_=Security constraints
-Name_UI_=Name
-(New_Web_Resource_Collecti_UI_=(New Web Resource Collection)
-Choose_a_JSP_UI_=Choose a JSP
-Select_a_JSP_file_UI_=Select a JSP file
-Choose_a_servlet_UI_=Choose a servlet
-Select_a_servlet_class_UI_=Select a servlet class
-(New_URL)_UI_=(New URL)
-Icon_change_UI_=Icon change
-Authorized_Roles__UI_=Authorized roles:
-Delete_servlet_mappings_UI_=Delete servlet mappings
-Type__UI_=Type:
-Servlet_class_UI_=Servlet class
-JSP_file_UI_=JSP file
-Display_name__UI_=Display name:
-Description__UI_=Description:
-Initialization__UI_=Initialization...
-Icons__UI_=Icons...
-Display_name_change_UI_=Display name change
-Description_change_UI_=Description change
-Web_type_change_UI_=Web type change
-URL_Mappings__UI_=URL mappings:
-New..._UI_=New...
-Add_UI_=Add
-Delete_servlets_UI_=Delete servlets
-Servlets_UI_=Servlets
-(New_URI)_UI_=(New URI)
-/WEB-INF/tlds/(taglib.tld)_UI_=/WEB-INF/tlds/(taglib.tld)
-New_taglib_UI_=New taglib
-Delete_taglibs_UI_=Delete taglibs
-URI_UI_=URI
-Location_UI_=Location
-(New_ContextParameter)_UI_=(New ContextParameter)
-New_context_parameter_UI_=New context parameter
-Context_parameters__UI_=Context parameters:
-Context_Parameter_Name_UI_=Context Parameter Name
-(New_Extension)_UI_=(New Extension)
-New_mime_mapping_UI_=New mime mapping
-Delete_mime_mappings_UI_=Delete mime mappings
-Session_time_out__UI_=Session time out:
-Distributable_UI_=Distributable
-Display_Name_UI_=Display Name
-Session_Config_UI_=Session Config
-Session_Timeout_UI_=Session Timeout
-Mime_mappings__UI_=Mime mappings:
-File_Extension_UI_=File Extension
-Mime_Type_UI_=Mime Type
-Delete_context_parameters_UI_=Delete context parameters
-Welcome_file_name_change_UI_=Welcome file name change
-(New_Welcome_File)_UI_=(New Welcome File)
-Choose_an_Error_Page_UI_=Choose an Error Page
-Select_an_Error_Page_UI_=Select an Error Page
-Delete_welcome_files_UI_=Delete welcome files
-Delete_error_pages_UI_=Delete error pages
-Welcome_files_UI_=Welcome files
-Choose_a_Login_Page_UI_=Choose a Login Page
-Select_a_Login_Page_UI_=Select a Login Page
-Error_mapping__UI_=Error mapping:
-Error/Exception_UI_=Error/Exception
-Login_UI_=Login
-Realm_name__UI_=Realm name:
-Authentication_method__UI_=Authentication method:
-Login_page__UI_=Login page:
-Error_page__UI_=Error page:
-New_login_config_UI_=New login config
-New_auth_method_ERROR_=IWAE0020E New auth method
-New_auth_method_UI_=New auth method
-New_realm_name_UI_=New realm name
-New_form_login_config_UI_=New form login config
-New_form_error_page_UI_=New form error page
-(New_Error_Code)_UI_=(New Error Code)
-New_error_page_UI_=New error page
-Role_Name_UI_=Role Name
-Select_all_UI_=Select all
-Deselect_all_UI_=Deselect all
-Authority_constraint_chang_UI_=Authority constraint change
-Select_Auth_Constraints_UI_=Select Auth Constraints
-Load_on_startup_UI_=Load on startup
-Load_order__UI_=Load order:
-New_parameter_UI_=New parameter
-Initialization_Parameter_UI_=Initialization Parameter
-Load_on_startup_change_UI_=Load on startup change
-Delete_parameter_UI_=Delete parameter
-Initialization_Parameters_UI_=Initialization Parameters
-Security_role_changes_UI_=Security role changes
-New_security_role_referenc_UI_=New security role reference
-remove_security_role_refer_UI_=remove security role reference
-Select_Authorized_Roles_UI_=Select Authorized Roles
-Name__UI_=Name:
-Delete_URL_Patterns_UI_=Delete URL Patterns
-URL_Patterns_UI_=URL Patterns
-HTTP_Methods_UI_=HTTP Methods
-(New_URL_pattern)_UI_=(New URL pattern)
-New_URL_pattern_UI_=New URL pattern
-Web_resource_collection_na_UI_=Web resource collection name change
-Web_resource_collection_de_UI_=Web resource collection description change
-Add_http_method_type_UI_=Add http method type
-Remove_http_method_type_UI_=Remove http method type
-EJB_references_UI_=EJB references
-Resource_factory_reference_UI_=Resource references
-JSP_tag_libraries_UI_=JSP tag libraries
-References_UI_=References
-Environment_UI_=Environment
-Source_UI_=Source
-Error_creating_nested_text_ERROR_=IWAE0021E Error creating nested text editor
-Pages_UI_=Pages
-Security_UI_=Security
-General_UI_=General
-The_description_property_UI_=The description property
-Roles_UI_=Roles
-The_roles_property_UI_=The roles property
-SecConstraint_UI_=SecConstraint
-The_secConstraint_property_UI_=The secConstraint property
-ParamName_UI_=ParamName
-The_paramName_property_UI_=The paramName property
-ParamValue_UI_=ParamValue
-The_paramValue_property_UI_=The paramValue property
-WebApp_UI_=WebApp
-The_webApp_property_UI_=The webApp property
-The_location_property_UI_=The location property
-ErrorCode_UI_=ErrorCode
-The_errorCode_property_UI_=The errorCode property
-ExceptionType_UI_=ExceptionType
-The_exceptionType_property_UI_=The exceptionType property
-FormLoginPage_UI_=FormLoginPage
-The_formLoginPage_property_UI_=The formLoginPage property
-FormErrorPage_UI_=FormErrorPage
-The_formErrorPage_property_UI_=The formErrorPage property
-LoginConfig_UI_=LoginConfig
-The_loginConfig_property_UI_=The loginConfig property
-HttpMethod_UI_=HttpMethod
-The_httpMethod_property_UI_=The httpMethod property
-ResCollection_UI_=ResCollection
-The_resCollection_property_UI_=The resCollection property
-AuthMethod_UI_=AuthMethod
-The_authMethod_property_UI_=The authMethod property
-RealmName_UI_=RealmName
-The_realmName_property_UI_=The realmName property
-FormLoginConfig_UI_=FormLoginConfig
-The_formLoginConfig_proper_UI_=The formLoginConfig property
-Extension_UI_=Extension
-The_extension_property_UI_=The extension property
-MimeType_UI_=MimeType
-The_mimeType_property_UI_=The mimeType property
-RoleName_UI_=RoleName
-The_roleName_property_UI_=The roleName property
-AuthConstraint_UI_=AuthConstraint
-The_authConstraint_propert_UI_=The authConstraint property
-UserDataConstraint_UI_=UserDataConstraint
-The_userDataConstraint_pro_UI_=The userDataConstraint property
-Create_WebResourceCollecti_UI_=Create WebResourceCollection
-SecurityConstraint_UI_=SecurityConstraint
-SmallIcon_UI_=SmallIcon
-Small_Icon_UI_=Small Icon
-LargeIcon_UI_=LargeIcon
-Large_Icon_UI_=Large Icon
-ServletName_UI_=ServletName
-The_servletName_property_UI_=The servletName property
-DisplayName_UI_=DisplayName
-The_displayName_property_UI_=The displayName property
-LoadOnStartup_UI_=LoadOnStartup
-The_loadOnStartup_property_UI_=The loadOnStartup property
-Create_InitParam_UI_=Create InitParam
-<servlet>_UI_=<servlet>
-UrlPattern_UI_=UrlPattern
-The_urlPattern_property_UI_=The urlPattern property
-Servlet_UI_=Servlet
-The_servlet_property_UI_=The servlet property
-?_UI_=?
-SessionTimeout_UI_=SessionTimeout
-The_sessionTimeout_propert_UI_=The sessionTimeout property
-TaglibURI_UI_=TaglibURI
-The_taglibURI_property_UI_=The taglibURI property
-TaglibLocation_UI_=TaglibLocation
-The_taglibLocation_propert_UI_=The taglibLocation property
-TransportGuarantee_UI_=TransportGuarantee
-The_transportGuarantee_pro_UI_=The transportGuarantee property
-The_distributable_property_UI_=The distributable property
-FileList_UI_=FileList
-The_fileList_property_UI_=The fileList property
-Create_ContextParam_UI_=Create ContextParam
-<web_app>_UI_=<web app>
-WebResourceName_UI_=WebResourceName
-The_webResourceName_proper_UI_=The webResourceName property
-Create_URLPatternType_UI_=Create URLPatternType
-WebType_UI_=WebType
-JspFile_UI_=JspFile
-The_jspFile_property_UI_=The jspFile property
-ClassName_UI_=ClassName
-The_className_property_UI_=The className property
-WelcomeFile_UI_=WelcomeFile
-The_welcomeFile_property_UI_=The welcomeFile property
-<welcome-file>_UI_=<welcome-file>
-Create_WelcomeFile_UI_=Create WelcomeFile
-Welcome_File_List_UI_=Welcome File List
-Error_Message_No_WRC_Entries_UI_=At least one web resource collection is required for a security constraint. If you want to delete this web resource collection, you must delete the entire security constraint.
-Error_Title_No_WRC_Entries_UI_=Web resource collection
-required1concat=Create a child of type #CHILD_CLASS_NAME# for the selected {0}.
-(New_URL)_UI__UI_=(New URL)
-New_param_UI__UI_=New param
-value_UI__UI_=value
-Select_Servlet_or_JSP_UI_=Select Servlet or JSP
-Select_JSP_UI_=Select JSP
-Add_Servlet_or_JSP_UI_=Add Servlet or JSP
-Add_JSP_UI_=Add JSP
-New_ErrorPage_UI_=New ErrorPage
-New_ExceptionType_UI_=New ExceptionType
-Add_Servlet_UI_=Add Servlet
-Web_Nature_Runtime_does_no_EXC_=IWAE0022E Web Nature Runtime does not exist.
-Editor_Redirection_UI_=Editor Redirection
-The_selected_web.xml_file__ERROR_=IWAE0023E The selected web.xml file is not contained within a WAR Project. Therefore, this web.xml file is not a Deployment Descriptor for a Web Archive, hence the XML editor will be opened.
-Problems_Opening_Editor_UI_=Problems Opening Editor
-Create_#CHILD_CLASS_NAME#_UI_=Create #CHILD_CLASS_NAME#
-Move_Welcome_Files_Down_UI_=Move Welcome Files Down
-Move_Welcome_Files_Up_UI_=Move Welcome Files Up
-Error_occurred_getting_web=Error occurred getting web.xml: {0}
-Select_Class_UI_=Select Class
-Could_not_uniquely_map_the_ERROR_=IWAE0024E Could not uniquely map the class name to a class.
-Information_UI_=Information
-The_chosen_operation_is_no_INFO_=IWAE0025I The chosen operation is not currently available.
-JNDI_Name_UI_=JNDI Name
-New_Servlet_UI_=New Servlet
-
-
-(New_Filter)_1=(New Filter)
-New_filter_2=New filter
-New_filter_mapping_1=New filter mapping
-New_listener_1=New listener
-The_name_property_2=The name property
-The_value_property_4=The value property
-The_target_property_2=The target property
-The_type_property_4=The type property
-The_ExternalCacheGroups_property_2=The ExternalCacheGroups property
-The_IdGenerator_property_4=The IdGenerator property
-The_InvalidateOnly_property_6=The InvalidateOnly property
-The_MetadataGenerator_property_8=The MetadataGenerator property
-The_Priority_property_10=The Priority property
-The_PropertiesGroupName_property_12=The PropertiesGroupName property
-The_Timeout_property_14=The Timeout property
-Small__1=Small:
-Large__3=Large:
-Choose_Small_Icon_5=Choose Small Icon
-Select_the_Small_Icon_6=Select the Small Icon
-Choose_Large_Icon_7=Choose Large Icon
-Select_the_Large_Icon_8=Select the Large Icon
-Caching_group_name__1=Caching group name:
-Priority__2=Priority:
-Timeout__3=Timeout:
-second(s)_4=second(s)
-Invalidate_only_5=Invalidate only
-Caching_group_members__6=Caching group members:
-_Servlet/JSP_7=\ Servlet/JSP
-Remove_9=Remove
-Use_URIs_for_cache_ID_building_1=Use URIs for cache ID building
-Use_specified_string__2=Use specified string:
-Variables__3=Variables:
-_ID_4=\ ID
-_Type_5=\ Type
-_Required_6=\ Required
-External_Cache_groups__1=External Cache groups:
-_Group_Name_2=\ Group Name
-ID_generator__3=ID generator:
-Meta_data_generator__4=Meta data generator:
-Remove_6=Remove
-Add_Servlet_Caching_Configuration_1=Add Servlet Caching Configuration
-Edit_Servlet_Caching_Configuration_2=Edit Servlet Caching Configuration
-Add_1=Add
-Remove_2=Remove
-UP_5=UP
-DOWN_6=DOWN
-Add_or_Remove_Servlet_or_JSP_1=Add or Remove Servlet or JSP
-Add_or_Remove_Security_Role_2=Add or Remove Security Role
-Add_or_Remove_Security_Constraint_3=Add or Remove Security Constraint
-Add_or_Remove_Environment_Variable_4=Add or Remove Environment Variable
-Add_or_Remove_EJB_Reference_5=Add or Remove EJB Reference
-Add_or_Remove_Resource_Reference_6=Add or Remove Resource Reference
-Add_or_Remove_JSP_Tag_Library_7=Add or Remove JSP Tag Library
-Add_or_Remove_Error_Page_8=Add or Remove Error Page
-Add_or_Remove_Exception_Page_9=Add or Remove Exception Page
-Add_or_Remove_Welcome_Page_10=Add or Remove Welcome Page
-Add_or_Remove_Context_Parameter_11=Add or Remove Context Parameter
-Add_or_Remove_Mime_Mapping_12=Add or Remove Mime Mapping
-Add_or_Remove_Filter_13=Add or Remove Filter
-Add_or_Remove_Listener_14=Add or Remove Listener
-Add_or_Remove_Mime_Filter_15=Add or Remove Mime Filter
-Add_or_Remove_File_Serving_Attribute_16=Add or Remove File Serving Attribute
-Add_or_Remove_Invoker_Attribute_17=Add or Remove Invoker Attribute
-Add_or_Remove_JSP_Attribute_18=Add or Remove JSP Attribute
-Add_or_Remove_Servlet_Caching_Configuration_19=Add or Remove Servlet Caching Configuration
-Read_Only_22=Read Only
-Writable_23=Writable
-Read_only_files____25=Read only files:
-Web_Deployment_Descriptor_28=Web Deployment Descriptor
-Environment_1=Environment
-Environment_Variables_2=Environment Variables
-Extensions_1=Extensions
-Filters_1=Filters
-Listeners_1=Listeners
-Mime_1=Mime
-Mime_Mappings_2=Mime Mappings
-Overview_1=Overview
-Pages_1=Pages
-Parameters_1=Parameters
-Context_Parameters_2=Context Parameters
-References_1=References
-References_2=References
-EJB_references_3=EJB references
-Resource_references_4=Resource references
-JSP_tag_libraries_5=JSP tag libraries
-Security_1=Security
-Security_Roles_3=Security Roles
-Security_Constraints_4=Security Constraints
-Servlets_1=Servlets
-Servlets_and_JSPs_2=Servlets and JSPs
-Details_1=Details
-Details_of_the_selected_environment_variable__2=Details of the selected environment variable:
-Type__3=Type:
-Value__13=Value:
-Mime_Type_change_14=Mime Type change
-Variables_1=Variables
-The_following_environment_variables_are_relevant_to_this_web_application__2=The following environment variables are relevant to this web application:
-(New_Variable)_3=(New Variable)
-File_Serving_Attributes_1=File Serving Attributes
-_Name_2=\ Name
-_Value_3=\ Value
-(name)_4=(name)
-(value)_5=(value)
-General_1=General
-Reloading_enabled_2=Reloading enabled
-Reload_interval__3=Reload interval:
-Default_error_page__5=Default error page:
-Additional_class_path__7=Additional class path:
-File_serving_enabled_9=File serving enabled
-Directory_browsing_enabled_10=Directory browsing enabled
-Serve_servlets_by_classname_11=Serve servlets by classname
-Precompile_JSPs_12=Precompile JSPs
-Automatic_Request_Encoding_enabled_13=Automatic Request Encoding enabled
-Automatic_Response_Encoding_enabled_14=Automatic Response Encoding enabled
-Choose_a_Default_Error_Page_15=Choose a Default Error Page
-Reload_Enabled_Changed_16=Reload Enabled Changed
-File_Serving_Enabled_Changed_17=File Serving Enabled Changed
-Directory_Browsing_Enabled_Changed_18=Directory Browsing Enabled Changed
-Serve_Servlets_by_classname_Enabled_Changed_19=Serve Servlets by classname Enabled Changed
-Precompile_JSPs_Enabled_Changed_20=Precompile JSPs Enabled Changed
-Automatic_Request_Encoding_Enabled_Changed_21=Automatic Request Encoding Enabled Changed
-Automatic_Response_Encoding_Enabled_Changed_22=Automatic Response Encoding Enabled Changed
-Reload_Interval_25=Reload Interval
-Default_Error_Page_26=Default Error Page
-Additional_Classpath_27=Additional Classpath
-Invoker_Attributes_1=Invoker Attributes
-JSP_Attributes_1=JSP Attributes
-MIME_Filters__1=MIME Filters
-_Target_2=\ Target
-_Type_3=\ Type
-(target)_4=(target)
-(type)_5=(type)
-Servlet_Caching_Configurations_1=Servlet Caching Configurations
-Details_of_the_selected_filter_2=Details of the selected filter
-Filter_class__3=Filter class:
-Display_name__5=Display name:
-Filter_Type_Selection_7=Filter Type Selection
-FilterItemProvider_UI_0=FilterName
-Choose_a_Filter_Type_8=Choose a Filter Type
-The_following_Filters_are_included_in_this_web_application__2=The following Filters are included in this web application:
-Icons_1=Icons
-The_following_icons_represent_the_selected_filter__2=The following icons represent the selected filter:
-Initialization_1=Initialization
-The_following_Filters_will_be_started_when_the_web_application_is_started__2=The following Filters will be started when the web application is started:
-_Name_3=\ Name
-_Value_4=\ Value
-Delete_Filter_Init_Param_5=Delete Filter Init Param
-(name)_6=(name)
-(value)_7=(value)
-New_Initialization_Parameter_8=New Initialization Parameter
-Servlet_Mappings_2=Servlet Mappings
-The_following_servlets_are_mapped_to_this_filter__3=The following servlets are mapped to this filter:
-Delete_filter_mappings_4=Delete filter mappings
-New_filter_mapping_5=New filter mapping
-URL_Mappings_1=URL Mappings
-The_following_URLs_are_mapped_to_this_filter__2=The following URLs are mapped to this filter:
-Delete_filter_mappings_3=Delete filter mappings
-New_filter_mapping_4=New filter mapping
-Details_of_the_selected_listener_2=Details of the selected listener
-Package__3=Package:
-(default_package)_5=(default package)
-Listeners_5=Listeners
-The_following_Listeners_are_included_in_this_web_application__6=The following Listeners are included in this web application:
-Listener_Type_Selection_10=Listener Type Selection
-Choose_a_Listener_Type_11=Choose a Listener Type
-Details_of_the_selected_file_extension__2=Details of the selected file extension:
-Mime_type__3=Mime type:
-Mime_Type_change_4=Mime Type change
-File_Extensions_1=File Extensions
-The_following_file_extensions_are_mapped_to_Mime_types__2=The following file extensions are mapped to Mime types:
-Context_Parameters_1=Context Parameters
-The_following_context_initialization_parameters_apply_to_all_servlets_in_this_web_application__2=The following context initialization parameters apply to all servlets in this web application:
-Environment_Variables_1=Environment Variables
-The_following_filters_are_used_in_this_application__2=The following filters are used in this application:
-General_Information_1=General Information
-Display_name__2=Display name:
-Description__3=Description:
-Session_time_out__4=Session time out:
-Distributable_5=Distributable
-Display_Name_6=Display Name
-Description_7=Description
-Icons_2=Icons
-The_following_icons_represent_this_web_application__3=The following icons represent this web application:
-The_following_listeners_are_used_in_this_application__2=The following listeners are used in this application:
-Mime_Type_1=Mime Type
-The_following_file_extensions_are_mapped_to_mime_types__2=The following file extensions are mapped to mime types:
-This_web_application_uses_the_following_welcome_and_error_pages__2=This web application uses the following welcome and error pages:
-This_web_application_references_the_following_resources__2=This web application references the following resources:
-The_following_security_roles_and_constraints_are_defined_for_this_web_application__2=The following security roles and constraints are defined for this web application:
-Servlets_and_JSPs_1=Servlets and JSPs
-The_following_servlets_and_JSPs_are_used_in_this_application__2=The following servlets and JSPs are used in this application:
-Usage_1=Usage
-The_following_Enterprise_Applications_use_this_web_module__2=The following Enterprise Applications use this web module:
-Error_Pages_1=Error Pages
-Resources_in_the_following_URLs_will_be_accessed_in_response_to_HTTP_error_codes__2=Resources in the following URLs will be accessed in response to HTTP error codes:
-_Error_Code_3=\ Error Code
-_URL_4=\ URL
-Java_Exception_Types_2=Java Exception Types
-Resources_in_the_following_URLs_will_be_accessed_in_response_to_Java_exception_types__3=Resources in the following URLs will be accessed in response to Java exception types:
-_Exception_Type_4=\ Exception Type
-_URL_5=\ URL
-Exception_Type_Selection_9=Exception Type Selection
-Choose_an_Exception_Type_10=Choose an Exception Type
-Login_1=Login
-The_following_Login_configuration_values_are_used_for_this_web_application__2=The following Login configuration values are used for this web application:
-Realm_name__3=Realm name:
-Authentication_method__4=Authentication method:
-Login_page__5=Login page:
-Error_page__8=Error page:
-Welcome_Pages_1=Welcome Pages
-The_server_will_search_for_the_following_pages,_in_this_order,_when_the_web_application_is_referenced__2=The server will search for the following pages, in this order, when the web application is referenced:
-The_following_context_parameters_are_included_in_this_web_application__2=The following context parameters are included in this web application:
-Details_of_the_selected_context_parameter__2=Details of the selected context parameter:
-Value__3=Value:
-Context_Param_Value_change_4=Context Param Value change
-WebSphere_Bindings_1=WebSphere Bindings
-JNDI_Name__2=JNDI Name:
-Ejb_Ref_JNDI_Name_change_3=Ejb Ref JNDI Name change
-Details_of_the_selected_EJB_reference_2=Details of the selected EJB reference
-Home__6=Home:
-Remote__7=Remote:
-Ejb_Ref_Home_change_8=Ejb Ref Home change
-Ejb_Ref_Remote_change_9=Ejb Ref Remote change
-EJB_Reference_Type_change_10=EJB Reference Type change
-EJB_References_1=EJB References
-The_following_EJB_references_are_used_in_this_web_application__2=The following EJB references are used in this web application:
-JNDI_Name_3=JNDI Name
-Details_of_the_selected_JSP_tag_library_2=Details of the selected JSP tag library
-URI__3=URI:
-Location__4=Location:
-JSP_tag_library_location_change_5=JSP tag library location change
-JSP_tag_library_URI_change_6=JSP tag library URI change
-JSP_tag_libraries_1=JSP tag libraries
-The_following_JSP_tag_libraries_are_used_in_this_web_application__2=The following JSP tag libraries are used in this web application:
-Resource_Ref_JNDI_Name_change_3=Resource Ref JNDI Name change
-Details_of_the_selected_resource_reference_2=Details of the selected resource reference
-Authentication__4=Authentication:
-Resource_Reference_Type_change_7=Resource Reference Type change
-Resource_Reference_Authentication_change_10=Resource Reference Authentication change
-Resource_References_1=Resource References
-The_following_resource_references_are_used_in_this_web_application__2=The following resource references are used in this web application:
-(New_ResourceRef)_3=(New ResourceRef)
-JNDI_Name_4=JNDI Name
-Authorized_Roles_2=Authorized Roles
-The_following_roles_are_authorized_to_access_the_web_resource_collections_in_this_security_constraint__3=The following roles are authorized to access the web resource collections in this security constraint:
-Security_Constraints_1=Security Constraints
-These_constraints_prescribe_access_policies_for_specific_web_resources_2=These constraints prescribe access policies for specific web resources
-User_Data_Constraint_1=User Data Constraint
-The_following_are_the_transport_guarantees_required_between_client_and_server_for_the_security_constraint__2=The following are the transport guarantees required between client and server for the security constraint:
-Web_Resource_Collections_1=Web Resource Collections
-The_following_define_web_resources_and_their_HTTP_method_for_this_web_application__2=The following define web resources and their HTTP method for this web application:
-Details_of_the_selected_security_role__2=Details of the selected security role:
-Security_Roles_Description_change_5=Security Roles Description change
-Security_Roles_1=Security Roles
-The_following_security_roles_are_defined_for_this_web_application__2=The following security roles are defined for this web application:
-Authorized_roles_2=Authorized roles
-The_following_roles_are_authorized_to_access_this_servlet__3=The following roles are authorized to access this servlet:
-Details_of_the_selected_servlet_or_JSP_2=Details of the selected servlet or JSP
-Servlet_class__3=Servlet class:
-WebSphere_Extensions_3=WebSphere Extensions
-Optional_WebSphere_specific_extensions_to_the_Web_Deployment_Descriptor_4=Optional WebSphere specific extensions to the Web Deployment Descriptor
-Unresolved_action__5=Unresolved action:
-Servlet_Extension_Change_6=Servlet Extension Change
-The_following_icons_represent_the_selected_servlet_or_JSP__3=The following icons represent the selected servlet or JSP:
-The_following_URLs_are_mapped_to_this_servlet__2=The following URLs are mapped to this servlet:
-The_following_servlets_and_JSPs_are_included_in_this_web_application__2=The following servlets and JSPs are included in this web application:
-The_filterName_property_3=The filterName property
-The_filter_property_2=The filter property
-The_ListenerClass_property_2=The ListenerClass property
-Details...=Details...
-Load_on_startup_5=Load on startup
-Load_order__6=Load order:
-Delete_Servlet_Init_Param_7=Delete Servlet Init Param
-(name)_8=(name)
-(value)_9=(value)
-New_Initialization_Parameter_10=New Initialization Parameter
-Filter_mapping___1=Filter mapping:
-SecurityConstraint_1=SecurityConstraint
-The_following_initialization_parameters_are_configured_for_this_servlet__1=The following initialization parameters are configured for this servlet:
-Filter_mapping_text=Filter mapping ({0} -> {1})
-Add_or_Remove_Resource_Environment_Reference_1=Add or Remove Resource Environment Reference
-MIME_1=MIME
-MIME_Mappings_2=MIME Mappings
-Resource_Environment_1=Resource Environment
-Automatic_Filter_Loading_enabled_1=Automatic Filter Loading enabled
-Automatic_Filter_Loading_Enabled_Changed_4=Automatic Filter Loading Enabled Changed
-The_following_servlets_have_this_filter_mapped_to_them_1=The following servlets have this filter mapped to them
-The_following_URLs_have_this_filter_mapped_to_them_1=The following URLs have this filter mapped to them
-MIME_type__1=MIME type:
-MIME_Type_change_2=MIME Type change
-The_following_file_extensions_are_mapped_to_MIME_types_1=The following file extensions are mapped to MIME types
-Location_1=\ Location
-Link__1=Link:
-Ejb_Ref_Link_change_2=Ejb Ref Link change
-Resource_Env_Ref_JNDI_Name_change_1=Resource Env Ref JNDI Name change
-Details_of_the_selected_resource_environment_reference_1=Details of the selected resource environment reference
-Type_Selection_2=Type Selection
-Choose_a_type_3=Choose a type
-Resource_Environment_References_1=Resource Environment References
-The_following_resource_environment_references_are_used_in_this_web_application_2=The following resource environment references are used in this web application
-New_ResourceEnvRef_3=New ResourceEnvRef
-Add_Servlet_Extension_1=Add Servlet Extension
-_ERROR_Problems_opening_editor_3=IWAE0026E Problems opening editor
-_ERROR_JSP_file_does_not_exist_4=IWAE0027E JSP file does not exist
-_ERROR_Problems_opening_editor_5=IWAE0028E Problems opening editor
-_ERROR_Could_not_find_type_within_project_6=IWAE0029E Could not find type within project
-_ERROR_Problems_opening_editor_7=IWAE0030E Problems opening editor
-_ERROR_Problems_opening_editor_8=IWAE0031E Problems opening editor
-Add_Variable_1=Add Variable
-Edit_Variable_2=Edit Variable
-Define_a_new_variable_in_this_servlet_caching_configuration_1=Define a new variable in this servlet caching configuration
-Variable_2=Variable
-ID__3=ID:
-Type__4=Type:
-Method__5=Method:
-Data_ID__6=Data ID:
-Invalid_ID__7=Invalid ID:
-Required_8=Required
-Add_External_Cache_Group_1=Add External Cache Group
-Add_an_external_cache_group_to_this_servlet_caching_configuration_1=Add an external cache group to this servlet caching configuration
-External_Cache_Group_2=External Cache Group
-Group_Name__3=Group Name:
-Group_Name_is_empty_5=Group Name is empty
-Caching_group_name_is_empty_2=Caching group name is empty
-Priority_must_be_an_integer_3=Priority must be an integer
-Timeout_must_be_an_integer_4=Timeout must be an integer
-Define_a_new_servlet_caching_configuration_1=Define a new servlet caching configuration
-Servlet_Caching_Configuration_2=Servlet Caching Configuration
-The_DefaultPage_property_2=The DefaultPage property
-The_ErrorPage_property_4=The ErrorPage property
-The_MimeType_property_6=The MimeType property
-The_Name_property_8=The Name property
-The_Pages_property_10=The Pages property
-The_ExtendedServlet_property_2=The ExtendedServlet property
-The_LocalTransaction_property_4=The LocalTransaction property
-The_MarkupLanguage_property_6=The MarkupLanguage property
-Define_Authorization_Constraint_1=Define Authorization Constraint
-Choose_a_servlet__1=Choose a servlet:
-Matching_servlets__2=Matching servlets:
-Qualifier__3=Qualifier:
-Add_or_Remove_EJB_Local_Reference_1=Add or Remove EJB Local Reference
-Add_or_Remove_Markup_Language_2=Add or Remove Markup Language
-Close_editor_3=Close editor
-File_has_been_deleted_from_the_file_system._nWhat_would_you_like_to_do__4=File has been deleted from the file system.\nWhat would you like to do?
-Save_and_close_editor_5=Save and close editor
-Close_editor_6=Close editor
-This_web.xml_file_is_not_a_valid_Deployment_Descriptor_for_a_Web_Archive,_hence_the_XML_editor_will_be_opened_7=This web.xml file is not a valid Deployment Descriptor for a Web Archive, hence the XML editor will be opened.
-EJB_1=EJB
-EJB_Local_2=EJB Local
-Resource_3=Resource
-Resource_Environment_1_4=Resource_Environment_1
-JSP_tag_libraries_5_5=JSP_tag_libraries_5
-Choose_a_filter__1=Choose a filter:
-Matching_filters__2=Matching filters:
-Choose_a_listener__1=Choose a listener:
-Matching_listener__2=Matching listener:
-Problems_opening_editor_2=Problems opening editor
-application.xml_does_not_exist_3=application.xml does not exist
-Refresh_4=Refresh
-Details_of_the_selected_EJB_Local_reference_1=Details of the selected EJB Local reference
-Local_home__2=Local home:
-Local__3=Local:
-EJB_Local_References_1=EJB Local References
-The_following_EJB_local_references_are_used_in_this_web_application_2=The following EJB local references are used in this web application
-(New_EJB_Local_Ref)_3=(New EJB Local Ref)
-(New_ResourceEnvRef)_1=(New ResourceEnvRef)
-Description__2=Description:
-Description_change_3=Description change
-Details_of_the_Servlet_Extension_of_the_selected_servlet_1=Details of the Servlet Extension of the selected servlet
-Markup_Languages_2=Markup Languages
-Local_Transaction_3=Local Transaction
-Delete_Filter_Mapping_1=Delete Filter Mapping
-Add_Filter_Mappings_2=Add Filter Mappings
-Choose_a_JSP__1=Choose a JSP:
-Name__2=Name:
-MIME_type__3=MIME type:
-Error_page__4=Error page:
-Browse_5=Browse
-Default_page__6=Default page:
-Browse_7=Browse
-Pages__8=Pages:
-_Name_9=\ Name
-_URI_10=\ URI
-(Name)_11=(Name)
-(URI)_12=(URI)
-Name_is_empty_13=Name is empty
-MIME_is_empty_14=MIME is empty
-Define_a_new_markup_language_entry_1=Define a new markup language entry
-Markup_Language_2=Markup Language
-Choose_a_Page_1=Choose a Page
-Description__1=Description:
-Environment_variable_value_change_1=Environment variable value change
-Environment_variable_description_change_2=Environment variable description change
-Description_name_change_2=Description name change
-Context_Param_Description_change_1=Context Param Description change
-Ejb_Ref_Description_change_1=Ejb Ref Description change
-Resource_Environment_Ref_Description_change_1=Resource Environment Ref Description change
-Resource_Ref_Description_change_1=Resource Ref Description change
-Details_of_the_selected_security_constraint_1=Details of the selected security constraint
-Display_Name__2=Display Name:
-Security_Constraint_DisplayName_change_3=Security Constraint DisplayName change
-Empty_List_2=Empty List
-_UI_Select_a_tag_library_to_add_to_the_deployment_descriptor_1=Select a tag library to add to the deployment descriptor
-_UI_Add_a_Tag_Library_2=Add a Tag Library
-_UI_Tag_Libraries__3=Tag Libraries:
-_UI_Available_Custom_Tags__4=Available Custom Tags:
-_UI__Tag_5=\ Tag
-_UI__Description_6=\ Description
-_UI_URI__7=URI:
-_UI_Select_a_Tag_Library_8=Select a Tag Library
-_UI_URI_cannot_be_empty_10=URI cannot be empty
-Browse..._1=Browse...
-Browse..._3=Browse...
-Browse..._4=Browse...
-Remove_Link_7=Remove Link
-Home_interface_selection_8=Home interface selection
-Local_interface_selection_13=Local interface selection
-Choose_an_interface_16=Choose an interface
-Matching_interfaces__17=Matching interfaces:
-Set_EJB_Local_Ref_Link_18=Set EJB Local Ref Link
-Remove_EJB_Local_Ref_Link_19=Remove EJB Local Ref Link
-EJB_selection_3=EJB selection
-Choose_an_EJB_4=Choose an EJB
-Matching_EJBs__5=Matching EJBs:
-Location__6=Location:
-Empty_List_11=Empty List
-Set_EJB_Ref_Link_8=Set EJB Ref Link
-Remove_EJB_Ref_Link_9=Remove EJB Ref Link
-Home_interface_selection_11=Home interface selection
-Remote_interface_selection_14=Remote interface selection
-Choose_an_interface_17=Choose an interface
-Matching_interfaces__18=Matching interfaces:
-Specify_an_Error_Code_and_Location_1=Specify an Error Code and Location
-Specify_an_Exception_Type_and_Location_2=Specify an Exception Type and Location
-Add_an_Error_Page_3=Add an Error Page
-Error_Code__4=Error Code:
-Exception_Type__5=Exception Type:
-Select..._6=Select...
-Browse..._7=Browse...
-Location__8=Location:
-Browse..._9=Browse...
-Error_Code_is_empty_13=Error Code is empty
-Exception_Type_is_empty_14=Exception Type is empty
-Location_is_empty_16=Location is empty
-Location_18=Location
-Select_a_Page_19=Select a Page
-Add_a_page_to_this_markup_language_1=Add a page to this markup language
-Page_2=Page
-Name__3=Name:
-URI__4=URI:
-Name_is_empty_8=Name is empty
-URI_is_empty_10=URI is empty
-Details_of_the_Servlet_Extension_for_the_selected_servlet_1=Details of the Servlet Extension for the selected servlet
-Delete_Markup_Language_7=Delete Markup Language
-Add_Markup_Language_entry_8=Add Markup Language entry
-Edit_Markup_Language_entry_9=Edit Markup Language entry
-The_name_property_1=The name property
-The_URI_property_2=The URI property
-Empty_List_1=Empty List
-Web_Library_Projects_1=Web Library Projects
-The_following_JARs_are_mapped_to_Java_projects__2=The following JARs are mapped to Java projects:
-_JAR_Name_3=\ JAR Name
-_Java_Project_4=\ Java Project
-Error_5=Error
-Add_Page_1=Add Page
-Up_1=Up
-Down_2=Down
-Resource_Reference_Shareable_change_3=Resource Reference Shareable change
-Environment_variable_type_change_1=Environment variable type change
-WebSphere_Extensions_1=WebSphere Extensions
-Browse..._2=Browse...
-Remove_Page_3=Remove Page
-Tag_Library_1=Tag Library
-Create_Page_1=Create Page
-Create_MarkupLanguage_1=Create MarkupLanguage
-Add_or_Remove_Servlet_Extension_1=Add or Remove Servlet Extension
-_INFO_No_security_roles_exist._1=IWAE0032I No security roles exist.
-_INFO_No_Enterprise_Beans_which_implement_the_remote_interface_exist._1=IWAE0033I No Enterprise Beans which implement the remote interface exist.
-_INFO_No_Enterprise_Beans_which_implement_the_local_interface_exist._2=IWAE0034I No Enterprise Beans which implement the local interface exist.
-_INFO_No_servlets_exist_to_add._1=IWAE0035I No servlets exist to add.
-_INFO_No_classes_which_implement_javax.servlet.Filter_exist._1=IWAE0037I No classes which implement javax.servlet.Filter exist.
-_INFO_No_filters_exist_to_add._1=IWAE0038I No filters exist to add.
-_INFO_No_listeners_exist_to_add._1=IWAE0039I No listeners exist to add.
-_ERROR_Error_updating_Web_Properties_1=IWAE0040E Error updating Web Properties
-_INFO_No_home_interfaces_exist._1=IWAE0041I No home interfaces exist.
-_INFO_No_local_interfaces_exist._2=IWAE0042I No local interfaces exist.
-_INFO_No_remote_interfaces_exist._2=IWAE0043I No remote interfaces exist.
-_INFO_No_tag_libraries_exist_to_add._1=IWAE0044I No tag libraries exist to add.
-_INFO_No_exceptions_exist_to_add._1=IWAE0045I No exceptions exist to add.
-Add_Resource_Reference_Extension_3=Add Resource Reference Extension
-Virtual_Host_Name__1=Virtual Host Name:
-Connection_management__1=Connection management:
-Isolation_level__2=Isolation level:
-_Markup_Language_1=\ Markup Language
-_Mime_Type_2=\ Mime Type
-Boundary__3=Boundary:
-Resolver__4=Resolver:
-Unresolved_Action__5=Unresolved Action:
-Select_an_Error_Code_1=Select an Error Code
-Code_2=Code
-Description_3=Description
-*_denotes_error_code_new_to_HTTP_1.1_4=* denotes error code new to HTTP 1.1
-Continue*_6=Continue*
-Switching_Protocols*_8=Switching Protocols*
-OK_10=OK
-Created_12=Created
-Accepted_14=Accepted
-Non-Authoritative_Information*_16=Non-Authoritative Information*
-No_Content_18=No Content
-Reset_Content*_20=Reset Content*
-Partial_Content*_22=Partial Content*
-Multiple_Choices_24=Multiple Choices
-Moved_Permanently_26=Moved Permanently
-Found_28=Found
-See_Other*_30=See Other*
-Not_Modified_32=Not Modified
-Use_Proxy*_34=Use Proxy*
-Temporary_Redirect*_36=Temporary Redirect*
-Bad_Request_38=Bad Request
-Unauthorized_40=Unauthorized
-Forbidden_42=Forbidden
-Not_Found_44=Not Found
-Method_Not_Allowed*_46=Method Not Allowed*
-Not_Acceptable*_48=Not Acceptable*
-Proxy_Authentication_Required*_50=Proxy Authentication Required*
-Request_Timeout*_52=Request Timeout*
-Conflict*_54=Conflict*
-Gone*_56=Gone*
-Length_Required*_58=Length Required*
-Precondition_Failed*_60=Precondition Failed*
-Request_Entity_Too_Large*_62=Request Entity Too Large*
-Request_URI_Too_Long*_64=Request URI Too Long*
-Unsupported_Media_Type*_66=Unsupported Media Type*
-Requested_Range_Not_Satisfiable*_68=Requested Range Not Satisfiable*
-Expectation_Failed*_70=Expectation Failed*
-Internal_Server_Error_72=Internal Server Error
-Not_Implemented_74=Not Implemented
-Bad_Gateway_76=Bad Gateway
-Service_Unavailable_78=Service Unavailable
-Gateway_Timeout*_80=Gateway Timeout*
-HTTP_Version_Not_Supported*_82=HTTP Version Not Supported*
-Choose_a_Servlet_1=Choose a Servlet
-Unspecified_1=Unspecified
-Sharing__1=Sharing:
-Error_Page_1=Error Page
-New_EJB_Ref=(New EJB Ref)
-selectSR=Select a Security Role
-Role_name=Role name
-NoSR=No Security Roles exist.
-RemoveUDC=Remove User Data Constraint
-UDC_desc_change=User Data Constraint description changed
-Run_As=Run As
-detRunAs=Details of the selected servlet's run-as element
-SR=Security role:
-Select=Select...
-Remove=Remove
-RemoveRA=Remove run-as
-SetRA=Set run-as
-SetRN=Set role-name
-SecurityRoleRefDialog.Security_Role_Ref=Security Role Ref
-SecurityRoleRefDialog.Role_name=Role name:
-SecurityRoleRefDialog.Role_link=Role link:
-SecurityRoleRefDialog.Description=Description:
-WebapplicationEditor.Add_or_Remove_Security_Role_Ref=Add or Remove Security Role Ref
-Ser_AuthSection._Link=\ Link
-Ser_AuthSection.Edit_Security_Role_Ref=Edit Security Role Ref
-srr_header=Security Role References
-srr_description=The following security role references are defined for this servlet:
-Local_encoding_mapping_list_UI_=Locale Encoding Mapping List
-local_encoding_mapping_UI_=Locale Encoding Mapping
-_UI_JSPConfig_type=JSP Config
-_UI_TagLibRefType_type=TagLibRefType
-_UI_JSPPropertyGroup_type=JSPPropertyGroup
-_UI_JSPPropertyGroup_urlPattern_feature=URL Pattern
-_UI_JSPPropertyGroup_elIgnored_feature=El Ignored
-_UI_JSPPropertyGroup_pageEncoding_feature=Page Encoding
-_UI_JSPPropertyGroup_scriptingInvalid_feature=Scripting Invalid
-_UI_JSPPropertyGroup_isXML_feature=Is XML
-_UI_JSPPropertyGroup_includePreludes_feature=Include Preludes
-_UI_JSPPropertyGroup_includeCodas_feature=Include Codas
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd b/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd
deleted file mode 100644
index f3e39e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.web">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.web" id="fileURL" name="File URL"/>
- </appInfo>
- <documentation>
- This is for the Web JSFaces File URL extension.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="fileURL"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="fileURL">
- <complexType>
- <sequence>
- <element ref="run"/>
- </sequence>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="run">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template b/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template
deleted file mode 100644
index 3954ec6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template
+++ /dev/null
@@ -1,37 +0,0 @@
-<% CreateServletTemplateModel model = (CreateServletTemplateModel) argument;
-if (model.getJavaPackageName()!=null && model.getJavaPackageName()!="") { %>package <%=model.getJavaPackageName()%>;<%}%>
-
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet implementation class for Servlet: <%=model.getServletClassName()%>
- *
- * @web.servlet
- * name="<%=model.getServletName()%>"
- * display-name="<%=model.getServletName()%>" <%
- if (model.getServletDescription() !=null && model.getServletDescription() != "") { %>
- * description="<%=model.getServletDescription()%>" <% } %>
- *
- <% List mappings = model.getServletMappings();
- if (mappings!=null && mappings.size()>0) {
- for (int i=0; i<mappings.size(); i++) {
- String map = model.getServletMapping(i); %>
- * @web.servlet-mapping
- * url-pattern="<%=map%>"
- * <% } }
- List initParams = model.getInitParams();
- if (initParams!=null && initParams.size()>0) {
- for (int i=0; i<initParams.size(); i++) {
- String name = model.getInitParam(i,CreateServletTemplateModel.NAME);
- String value = model.getInitParam(i,CreateServletTemplateModel.VALUE);
- String description = model.getInitParam(i,CreateServletTemplateModel.DESCRIPTION); %>
- * @web.servlet-init-param
- * name="<%=name%>"
- * value="<%=value%>" <% if (description !=null && description!="") { %>
- * description="<%=description%>" <%} %>
- * <% } } %>
- */
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template b/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template
deleted file mode 100644
index ac27405..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<% CreateServletTemplateModel model = (CreateServletTemplateModel) argument;
-if (model.getJavaPackageName()!=null && model.getJavaPackageName()!="") { %>package <%=model.getJavaPackageName()%>;<%}%>
-
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet implementation class for Servlet: <%=model.getServletClassName()%>
- *
- */
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet
deleted file mode 100644
index 8fa6b23..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet
+++ /dev/null
@@ -1,81 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.web"
- imports="org.eclipse.jst.j2ee.internal.web.operations.* java.util.* "
- class="ServletTemplate"
-%><%@ include file="servletHeader.template" %>
-
-<%if (model.isPublic()) {%>public<%}%> <%if (model.isAbstract()) {%>abstract <%}%><%if (model.isFinal()) {%>final <%}
-%>class <%=model.getServletClassName()%> extends <%=model.getSuperclassName()%><%
- List interfaces = model.getInterfaces();
- if (interfaces.size()>0) {%> implements <% }
- for (int i=0; i<interfaces.size(); i++) {
- String INTERFACE = (String) interfaces.get(i);
- if (i>0) { %>, <%}%><%=INTERFACE%><%}%> {
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#HttpServlet()
- */
- public <%=model.getServletClassName()%>() {
- super();
- } <% if (model.shouldGenDestroy()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.Servlet#destroy()
- */
- public void destroy() {
- // TODO Auto-generated method stub
- super.destroy();
- } <% } %> <% if (model.shouldGenDoDelete()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doDelete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
- */
- protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- super.doDelete(request, response);
- } <% } %> <% if (model.shouldGenDoGet()) { %>
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- } <% } %> <% if (model.shouldGenDoPost()) { %>
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- } <% } %> <% if (model.shouldGenDoPut()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPut(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
- */
- protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- super.doPut(request, response);
- } <% } %> <% if (model.shouldGenGetServletInfo()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.Servlet#getServletInfo()
- */
- public String getServletInfo() {
- // TODO Auto-generated method stub
- return super.getServletInfo();
- } <% } %> <% if (model.shouldGenInit()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.GenericServlet#init()
- */
- public void init() throws ServletException {
- // TODO Auto-generated method stub
- super.init();
- } <% } %> <% if (model.shouldGenToString()) { %>
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- // TODO Auto-generated method stub
- return super.toString();
- } <% } %>
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet
deleted file mode 100644
index 31b7e48..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet
+++ /dev/null
@@ -1,81 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.web"
- imports="org.eclipse.jst.j2ee.internal.web.operations.* java.util.* "
- class="ServletTemplate"
-%><%@ include file="servletHeaderNonAnnotated.template" %>
-
-<%if (model.isPublic()) {%>public<%}%> <%if (model.isAbstract()) {%>abstract <%}%><%if (model.isFinal()) {%>final <%}
-%>class <%=model.getServletClassName()%> extends <%=model.getSuperclassName()%><%
- List interfaces = model.getInterfaces();
- if (interfaces.size()>0) {%> implements <% }
- for (int i=0; i<interfaces.size(); i++) {
- String INTERFACE = (String) interfaces.get(i);
- if (i>0) { %>, <%}%><%=INTERFACE%><%}%> {
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#HttpServlet()
- */
- public <%=model.getServletClassName()%>() {
- super();
- } <% if (model.shouldGenDestroy()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.Servlet#destroy()
- */
- public void destroy() {
- // TODO Auto-generated method stub
- super.destroy();
- } <% } %> <% if (model.shouldGenDoDelete()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doDelete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
- */
- protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- super.doDelete(request, response);
- } <% } %> <% if (model.shouldGenDoGet()) { %>
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- } <% } %> <% if (model.shouldGenDoPost()) { %>
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- } <% } %> <% if (model.shouldGenDoPut()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPut(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
- */
- protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- super.doPut(request, response);
- } <% } %> <% if (model.shouldGenGetServletInfo()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.Servlet#getServletInfo()
- */
- public String getServletInfo() {
- // TODO Auto-generated method stub
- return super.getServletInfo();
- } <% } %> <% if (model.shouldGenInit()) { %>
-
- /* (non-Javadoc)
- * @see javax.servlet.GenericServlet#init()
- */
- public void init() throws ServletException {
- // TODO Auto-generated method stub
- super.init();
- } <% } %> <% if (model.shouldGenToString()) { %>
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- // TODO Auto-generated method stub
- return super.toString();
- } <% } %>
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java
deleted file mode 100644
index 5c54733..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java
+++ /dev/null
@@ -1,31 +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.jst.j2ee.internal.web.validation;
-
-import java.util.Hashtable;
-
-
-/**
- * Insert the type's description here. Creation date: (10/2/2001 7:06:43 PM)
- *
- * @author: Administrator
- */
-public class UIWarHelper extends WarHelper {
-
- Hashtable aWarFileMap = new Hashtable();
-
- /**
- * UIWarHelper constructor comment.
- */
- public UIWarHelper() {
- super();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
deleted file mode 100644
index 7871d8f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
+++ /dev/null
@@ -1,166 +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.jst.j2ee.internal.web.validation;
-
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.WarValidator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * Insert the type's description here. Creation date: (10/2/2001 6:46:56 PM)
- *
- * @author: Administrator
- */
-public class UIWarValidator extends WarValidator {
-
- protected org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper warHelper;
-
-
-
-
- /**
- * UIWarValidator constructor comment.
- */
- public UIWarValidator() {
- super();
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 8:01:45 PM)
- *
- * @return org.eclipse.wst.validation.internal.core.core.war.workbenchimpl.UIWarHelper
- */
- public org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper getWarHelper() {
- return warHelper;
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 8:01:45 PM)
- *
- * @param newWarHelper
- * org.eclipse.wst.validation.internal.core.core.war.workbenchimpl.UIWarHelper
- */
- public void setWarHelper(org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper newWarHelper) {
- warHelper = newWarHelper;
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
- */
- public void validate() throws ValidationException {
- // First remove all previous msg. for this project
- // _reporter.removeAllMessages(this,null);
- super.validate();
- validateEARForContextRoot();
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
- */
- public void validate(IValidationContext inHelper, IReporter inReporter) throws org.eclipse.wst.validation.internal.core.ValidationException {
- setWarHelper((UIWarHelper) inHelper);
- IProject proj = ((IWorkbenchContext) inHelper).getProject();
- IVirtualComponent wbModule = ComponentCore.createComponent(proj);
- if( wbModule != null && J2EEProjectUtilities.isDynamicWebProject(proj)) {
- IVirtualFile webFile = wbModule.getRootFolder().getFile(J2EEConstants.WEBAPP_DD_URI);
- if( webFile.exists()) {
- super.validate(inHelper, inReporter);
- }
- }
- }
-
-
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
- */
- public void validateEARForContextRoot() {
-
-// IProject project = getWarHelper().getProject();
-// J2EEWebNatureRuntime webNature = J2EEWebNatureRuntime.getRuntime(project);
-// String contextRoot = webNature.getContextRoot();
-//
-// if (webNature == null)
-// return;
-//
-// EARNatureRuntime earRuntimeNature[] = webNature.getReferencingEARProjects();
-
-// for (int i = 0; i < earRuntimeNature.length; i++) {
-// // for each Ear Project that contains this web project update the context root.
-// // hold the model and validate the context root & release the model
-// org.eclipse.jst.j2ee.internal.earcreation.EAREditModel editModel = null;
-// try {
-// editModel = earRuntimeNature[i].getEarEditModelForRead(this);
-// if (editModel != null) {
-// Module module = null;
-// if ((module = earRuntimeNature[i].getModule(project)) != null) {
-// String webModcontextRoot = ((WebModule) module).getContextRoot();
-// if (webModcontextRoot != null && !webModcontextRoot.equals(contextRoot)) {
-// String[] params = new String[3];
-// params[0] = project.getName();
-// params[1] = ((WebModule) module).getContextRoot();
-// params[2] = earRuntimeNature[i].getProject().getName();
-// addError(WAR_CATEGORY, ERROR_EAR_INVALID_CONTEXT_ROOT, params);
-// }
-// }
-// }
-// } finally {
-// if (editModel != null) {
-// editModel.releaseAccess(this);
-// editModel = null;
-// }
-// }
-//
-// }
-
- }
-
- /**
- * Method validateLibModules.
- *
- *
- */
-
- //TODO create validation for modules
-/* protected void validateLibModules(J2EEWebNatureRuntime webNature) {
- if (webNature != null) {
- ILibModule[] libModules = webNature.getLibModules();
- IProject project = webNature.getProject();
-
- for (int i = 0; i < libModules.length; i++) {
- ILibModule lib = libModules[i];
- IProject tProject = lib.getProject();
- if (tProject != null) { // Project could be null if JavaProject is deleted, for
- // example
- if (!tProject.exists() || !tProject.isOpen()) {
- addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT, new String[]{tProject.getName()}, webNature.getProject());
- }
- }
-
- String jarName = lib.getJarName();
- IPath jarPath = webNature.getLibraryFolder().getFullPath().append(jarName);
- if (((Resource) project).findExistingResourceVariant(jarPath) != null)
- addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT, new String[]{jarName}, webNature.getProject());
- }
- }
- }*/
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java
deleted file mode 100644
index 8886eec..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java
+++ /dev/null
@@ -1,121 +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.jst.j2ee.internal.web.validation;
-
-
-
-//import org.eclipse.wst.validation.internal.core.core.IMessage;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.validation.J2EEValidationHelper;
-import org.eclipse.jst.j2ee.model.internal.validation.WARMessageConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-
-
-public class WarHelper extends J2EEValidationHelper {
- Hashtable warFileMap = new Hashtable();
- final static String HelperID = "org.eclipse.wst.validation.internal.core.war.workbenchimpl.WarHelper"; //$NON-NLS-1$
-
-
- /**
- * WarHelper constructor comment.
- */
-
- public WarHelper() {
- super();
-
- registerModel(WARMessageConstants.WAR_MODEL_NAME, "loadWarFile"); //$NON-NLS-1$
- }
-
- /**
- * This method will be invoked indirectly from the WarValidator (via. the WorkbenchReporter). It
- * will expect the coming object to be a EObject for the node who generated this message. Note:
- * This methods may need to be implemented higher up in the class stack.
- */
- public int getLineNo(Object object) {
-
-
- if (object instanceof Integer) { // Error discovered using the XML parser
- return ((Integer) object).intValue();
- }
-
- return super.getLineNo(object);
- }
-
- /**
- * Given a resource, return its non-eclipse-specific location. If this resource, or type of
- * resource, isn't handled by this helper, return null.
- */
- public String getPortableName(IResource resource) {
- if (!(resource instanceof IFile)) {
- return null;
- }
-
- IPath resourcePath = resource.getFullPath();
- if (resourcePath != null)
- return resourcePath.toString();
-
- return null;
- }
-
- /**
- * Similar to the getFile() method, we know that we are talking about web.xml, but need a unique
- * ID.
- *
- * @return java.lang.String
- * @param object
- * Object
- */
- public String getTargetObjectName(Object object) {
- String ret = null;
- if (object != null) {
- IFile warFile = (IFile) warFileMap.get(getProject().toString());// validator framework
- // will call getFile()
- // first.
- if (warFile != null) {
- ret = (warFile.toString() + HelperID);
- }
- }
- return ret;
- }
-
-
- //public EObject loadWarFile(ComponentHandle handle) {
- public EObject loadWarFile() {
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- Archive archive = ((WebArtifactEdit) edit).asArchive(false);
- return archive;
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java
deleted file mode 100644
index 27ab2ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 8, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.web.deployables;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-
-/**
- * @author blancett
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ModuleAdapter extends AdapterImpl {
-
- J2EEFlexProjDeployable delegate;
-
- public void setModuleDelegate(J2EEFlexProjDeployable moduleDelegate) {
- delegate = moduleDelegate;
- }
-
- public J2EEFlexProjDeployable getDelegate() {
- return delegate;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
deleted file mode 100644
index 440e4b8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
+++ /dev/null
@@ -1,327 +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.jst.j2ee.internal.web.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURL;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURLExtensionReader;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-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;
-
-/**
- * @version 1.0
- * @author
- */
-public class WebDeployableArtifactUtil {
-
- private final static String GENERIC_SERVLET_CLASS_TYPE = "javax.servlet.GenericServlet"; //$NON-NLS-1$
- private final static String CACTUS_SERVLET_CLASS_TYPE = "org.apache.cactus.server.ServletTestRedirector"; //$NON-NLS-1$
-
- public WebDeployableArtifactUtil() {
- super();
- }
-
- public static IModuleArtifact getModuleObject(Object obj) {
- IResource resource = null;
- if (obj instanceof IResource)
- resource = (IResource) obj;
- if (obj instanceof IModuleArtifact)
- resource = ((IModuleArtifact) obj).getModule().getProject();
- else if (obj instanceof IAdaptable)
- resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
- else if (obj instanceof EObject) {
- resource = ProjectUtilities.getProject((EObject) obj);
- if (obj instanceof Servlet) {
- Servlet servlet = ((Servlet) obj);
- Resource servResource = servlet.eResource();
- IVirtualResource[] resources = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- } catch (Exception e) {
- e.printStackTrace();
- }
- IVirtualComponent component = null;
- if (resources[0] != null)
- component = resources[0].getComponent();
- String mapping = null;
- java.util.List mappings = ((Servlet) obj).getMappings();
- if (mappings != null && !mappings.isEmpty()) {
- ServletMapping map = (ServletMapping) mappings.get(0);
- mapping = map.getUrlPattern();
- }
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- WebType webType = ((Servlet) obj).getWebType();
- if (webType.isJspType()) {
- resource = ((IProject) resource).getFile(((JSPType) webType).getJspFile()); //$NON-NLS-1$
- } else if (webType.isServletType()) {
- return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + ((ServletType) webType).getClassName())); //$NON-NLS-1$
- }
- }
- }
- if (resource == null)
- return null;
-
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if (hasInterestedComponents(project))
- return new WebResource(getModule(project, null), project.getProjectRelativePath());
- }
-
- if (!hasInterestedComponents(resource.getProject()))
- return null;
- if (isCactusJunitTest(resource))
- return null;
-
- IPath resourcePath = resource.getFullPath();
- IVirtualResource[] resources = ComponentCore.createResources(resource);
- IVirtualComponent component = null;
- if (resources[0] != null || resources.length <= 0)
- component = resources[0].getComponent();
- String className = getServletClassName(resource);
- if (className != null && component != null) {
- String mapping = getServletMapping(resource, true, className, component.getName());
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- // if there is no servlet mapping, provide direct access to the servlet
- // through the fully qualified class name
- return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + className)); //$NON-NLS-1$
-
- }
-
- resourcePath = resources[0].getRuntimePath();
-
- // Extension read to get the correct URL for Java Server Faces file if
- // the jsp is of type jsfaces.
- FileURL jspURL = FileURLExtensionReader.getInstance().getFilesURL();
- if (jspURL != null) {
- IPath correctJSPPath = jspURL.getFileURL(resource, resourcePath);
- if (correctJSPPath != null && correctJSPPath.toString().length() > 0)
- return new WebResource(getModule(resource.getProject(), component), correctJSPPath);
- }
- // return Web resource type
- return new WebResource(getModule(resource.getProject(), component), resourcePath);
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- IModule deployable = null;
- Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.DYNAMIC_WEB)).iterator(); //$NON-NLS-1$
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- else
- return getModuleProject(project, iterator);
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getName().equals(componentName)) {
- return deployable;
- }
- }
- }
- return null;
- }
-
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
- /**
- *
- * Very temporary api - TODO - rip this out by 1.0
- */
- private static boolean isCactusJunitTest(IResource resource) {
- return getClassNameForType(resource, CACTUS_SERVLET_CLASS_TYPE) != null;
- }
-
-
-
- private static IType[] getTypes(IJavaElement element) {
- try {
- if (element.getElementType() != IJavaElement.COMPILATION_UNIT)
- return null;
-
- return ((ICompilationUnit) element).getAllTypes();
- } catch (Exception e) {
- return null;
- }
- }
-
- public static String getServletClassName(IResource resource) {
- return getClassNameForType(resource, GENERIC_SERVLET_CLASS_TYPE);
- }
-
- public static String getClassNameForType(IResource resource, String superType) {
- if (resource == null)
- return null;
-
- try {
- IProject project = resource.getProject();
- IPath path = resource.getFullPath();
- if (!project.hasNature(JavaCore.NATURE_ID) || path == null)
- return null;
-
- IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (!javaProject.isOpen())
- javaProject.open(new NullProgressMonitor());
-
- // output location may not be on classpath
- IPath outputPath = javaProject.getOutputLocation();
- if (outputPath != null && "class".equals(path.getFileExtension()) && outputPath.isPrefixOf(path)) { //$NON-NLS-1$
- int count = outputPath.segmentCount();
- path = path.removeFirstSegments(count);
- }
-
- // remove initial part of classpath
- IClasspathEntry[] classPathEntry = javaProject.getResolvedClasspath(true);
- if (classPathEntry != null) {
- int size = classPathEntry.length;
- for (int i = 0; i < size; i++) {
- IPath classPath = classPathEntry[i].getPath();
- if (classPath.isPrefixOf(path)) {
- int count = classPath.segmentCount();
- path = path.removeFirstSegments(count);
- i += size;
- }
- }
- }
-
- // get java element
- IJavaElement javaElement = javaProject.findElement(path);
-
- IType[] types = getTypes(javaElement);
- if (types != null) {
- int size2 = types.length;
- for (int i = 0; i < size2; i++) {
- if (hasSuperclass(types[i], superType))
- return types[i].getFullyQualifiedName();
- }
- }
- return null;
- } catch (Exception e) {
- return null;
- }
- }
-
- public static boolean hasSuperclass(IType type, String superClassName) {
- try {
- ITypeHierarchy hierarchy = type.newSupertypeHierarchy(null);
- IType[] superClasses = hierarchy.getAllSuperclasses(type);
-
- int size = superClasses.length;
- for (int i = 0; i < size; i++) {
- if (superClassName.equals(superClasses[i].getFullyQualifiedName())) //$NON-NLS-1$
- return true;
- }
- return false;
- } catch (Exception e) {
- return false;
- }
- }
-
- public static String getServletMapping(IResource resource, boolean isServlet, String typeName, String componentName) {
- if (typeName == null || typeName.equals("")) //$NON-NLS-1$
- return null;
-
- IProject project = resource.getProject();
- WebArtifactEdit edit = null;
- WebApp webApp = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(project);
- edit.getDeploymentDescriptorRoot();
- webApp = edit.getWebApp();
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- try {
- if (webApp == null)
- return null;
- Iterator iterator = webApp.getServlets().iterator();
- while (iterator.hasNext()) {
- Servlet servlet = (Servlet) iterator.next();
- boolean valid = false;
-
- WebType webType = servlet.getWebType();
- if (webType.isServletType() && isServlet) {
- ServletType type = (ServletType) webType;
- if (typeName.equals(type.getClassName()))
- valid = true;
- } else if (webType.isJspType() && !isServlet) {
- JSPType type = (JSPType) webType;
- if (typeName.equals(type.getJspFile()))
- valid = true;
- }
- if (valid) {
- java.util.List mappings = servlet.getMappings();
- if (mappings != null && !mappings.isEmpty()) {
- ServletMapping map = (ServletMapping) mappings.get(0);
- return map.getUrlPattern();
- }
- }
- }
- return null;
- } catch (Exception e) {
- return null;
- }
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return J2EEProjectUtilities.isDynamicWebProject(project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java
deleted file mode 100644
index 9f213a9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.web.deployables;
-
-/**
- * Key Class for adapter manager
- */
-public class WebModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java
deleted file mode 100644
index 777e925..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java
+++ /dev/null
@@ -1,31 +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
- *******************************************************************************/
-/*
- * Created on Jun 13, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.web.jfaces.extension;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface FileURL {
- public IPath getFileURL(IResource resource, IPath existingURL);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.java
deleted file mode 100644
index 53e2075..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.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
- *******************************************************************************/
-/*
- * Created on Jun 13, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.web.jfaces.extension;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class FileURLExtension {
- private String id = null;
- private FileURL instance;
- private boolean errorCondition = false;
- private IConfigurationElement element;
- public static final String FILE_URL_EXTENSION = "fileURL"; //$NON-NLS-1$
- public static final String RUN = "run"; //$NON-NLS-1$
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
-
- /**
- *
- */
- public FileURLExtension() {
- super();
- }
-
- public FileURL getInstance() {
- try {
- if (this.instance == null && !this.errorCondition)
- this.instance = (FileURL) this.element.createExecutableExtension("run"); //$NON-NLS-1$
- } catch (Throwable e) {
- Logger.getLogger().logError(e);
- this.errorCondition = true;
- }
- return this.instance;
- }
-
- public FileURLExtension(IConfigurationElement element) {
- if (!FILE_URL_EXTENSION.equals(element.getName()))
- throw new IllegalArgumentException("Extensions must be of the type \"" + FILE_URL_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
-
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java
deleted file mode 100644
index c188cc3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java
+++ /dev/null
@@ -1,116 +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
- *******************************************************************************/
-/*
- * Created on Jun 13, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.jfaces.extension;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-/**
- * @author vijayb
- *
- * This class loads all the extensions that define the correct URL string for the Java Server Faces
- * file
- *
- */
-public class FileURLExtensionReader extends RegistryReader {
- static FileURLExtensionReader instance = null;
- protected List fileURLExtensions;
-
- /**
- * @param registry
- * @param pluginID
- * @param extensionPoint
- */
- public FileURLExtensionReader() {
- super(WebPlugin.PLUGIN_ID, "fileURL"); //$NON-NLS-1$
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (FileURLExtension.FILE_URL_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtension(IConfigurationElement newExtension) {
- getFileURLExtensions().add(new FileURLExtension(newExtension));
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtensionPoint(FileURLExtensionReader newExtension) {
- if (this.fileURLExtensions == null)
- this.fileURLExtensions = new ArrayList();
- this.fileURLExtensions.add(newExtension);
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public FileURL getFilesURL() {
- FileURLExtension fileURLExt;
- for (Iterator fileURLExtItr = getFileURLExtensions().iterator(); fileURLExtItr.hasNext();) {
- fileURLExt = (FileURLExtension) fileURLExtItr.next();
- return fileURLExt.getInstance();
- }
- return null;
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a FileURLExtensionReader
- */
- public static FileURLExtensionReader getInstance() {
- if (instance == null) {
- instance = new FileURLExtensionReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- /**
- * @return Returns the handlerExtensions.
- */
- protected List getFileURLExtensions() {
- if (this.fileURLExtensions == null)
- this.fileURLExtensions = new ArrayList();
- return this.fileURLExtensions;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java
deleted file mode 100644
index a994659..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java
+++ /dev/null
@@ -1,307 +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.jst.j2ee.internal.web.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * This class, AddServlet Operation is a IDataModelOperation following the IDataModel wizard and
- * operation framework.
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * This operation subclasses the ArtifactEditProviderOperation so the changes made to the deployment descriptor
- * models are saved to the artifact edit model.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * It is the operation which should be used when adding a new servlet to
- * a web app, whether that be an annotated servlet or a non annotated servlet. This uses the
- * NewServletClassDataModelProvider to retrieve properties set by the user in order to create the custom
- * servet.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider
- *
- * In the non annotated case, this operation will add the metadata necessary into the web deployment
- * descriptor. In the annotated case, it will not, it will leave this up to the parsing of the
- * annotations to build the deployment descriptor artifacts. To actually create the java class for
- * the servlet, the operation uses the NewServletClassOperation. The NewServletClassOperation
- * shares the same data model provider.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassOperation
- *
- * Clients may subclass this operation to provide their own behaviour on servlet creation. The execute
- * method can be extended to do so. Also, generateServletMetaData and creteServletClass are exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class AddServletOperation extends ArtifactEditProviderOperation {
-
- /**
- * This is the constructor which should be used when creating the operation.
- * It will not accept null parameter. It will not return null.
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- *
- * @param dataModel
- * @return AddServletOperation
- */
- public AddServletOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * Subclasses may extend this method to add their own actions during execution.
- * The implementation of the execute method drives the running of the operation. This
- * implementation will create the servlet class, and then if the servlet is not
- * annotated, it will create the servlet metadata for the web deployment descriptor.
- * This method will accept null as a parameter.
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- * @see AddServletOperation#createServletClass()
- * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
- *
- * @param monitor IProgressMonitor
- * @param info IAdaptable
- * @throws CoreException
- * @throws InterruptedException
- * @throws InvocationTargetException
- */
- public IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- //Retrieve values set in the newservletclass data model
- boolean isServletType = model.getBooleanProperty(INewServletClassDataModelProperties.IS_SERVLET_TYPE);
- boolean useExisting = model.getBooleanProperty(INewServletClassDataModelProperties.USE_EXISTING_CLASS);
- String qualifiedClassName = model.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME);
-
- // If it is servlet type, create the java class
- if (isServletType && !useExisting)
- qualifiedClassName = createServletClass();
-
- // If the servlet is not annotated, generate the servlet metadata for the DD
- if (!model.getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS))
- generateServletMetaData(model, qualifiedClassName, isServletType);
-
- return OK_STATUS;
- }
-
- /**
- * Subclasses may extend this method to add their own creation of the actual servlet java class.
- * This implementation uses the NewServletClassOperation which is a subclass of the NewJavaClassOperation.
- * The NewServletClassOperation will use the same NewServletClassDataModelProvider to retrieve the properties in
- * order to create the java class accordingly. This method will not return null.
- * @see NewServletClassOperation
- * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassOperation
- * @see NewServletClassDataModelProvider
- *
- * @return String qualified servlet classname
- */
- protected String createServletClass() {
- // Create servlet java class file using the NewServletClassOperation. The same data model is shared.
- NewServletClassOperation op = new NewServletClassOperation(model);
- try {
- op.execute(new NullProgressMonitor(), null);
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- // Return the qualified classname of the newly created java class for the servlet
- return getQualifiedClassName();
- }
-
- /**
- * This method will return the qualified java class name as specified by the class name
- * and package name properties in the data model.
- * This method should not return null.
- * @see INewJavaClassDataModelProperties#CLASS_NAME
- * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
- *
- * @return String qualified java classname
- */
- public final String getQualifiedClassName() {
- // Use the java package name and unqualified class name to create a qualified java class name
- String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
- String className = model.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME);
- //Ensure the class is not in the default package before adding package name to qualified name
- if (packageName != null && packageName.trim().length() > 0)
- return packageName + "." + className; //$NON-NLS-1$
- return className;
- }
-
- /**
- * Subclasses may extend this method to add their own generation steps for the creation of the
- * metadata for the web deployment descriptor. This implementation uses the J2EE models to create
- * the Servlet model instance, any init params specified, and any servlet mappings. It then adds
- * these to the web application model. This will then be written out to the deployment descriptor
- * file. This method does not accept null parameters.
- * @see Servlet
- * @see AddServletOperation#createServlet(String, boolean)
- * @see AddServletOperation#setUpInitParams(List, Servlet)
- * @see AddServletOperation#setUpURLMappings(List, Servlet)
- *
- * @param aModel
- * @param qualifiedClassName
- * @param isServletType
- */
- protected void generateServletMetaData(IDataModel aModel, String qualifiedClassName, boolean isServletType) {
- // Set up the servlet modelled object
- Servlet servlet = createServlet(qualifiedClassName, isServletType);
-
- // Set up the InitParams if any
- List initParamList = (List) aModel.getProperty(INewServletClassDataModelProperties.INIT_PARAM);
- if (initParamList != null)
- setUpInitParams(initParamList,servlet);
-
- // Set up the servlet URL mappings if any
- List urlMappingList = (List) aModel.getProperty(INewServletClassDataModelProperties.URL_MAPPINGS);
- if (urlMappingList != null)
- setUpURLMappings(urlMappingList, servlet);
- }
-
- /**
- * This method is intended for private use only. This method is used to create the servlet
- * modelled object, to set any parameters specified in the data model, and then to add the
- * servlet instance to the web application model. This method does not accpet null parameters.
- * It will not return null.
- * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
- * @see WebapplicationFactory#createServlet()
- * @see Servlet
- *
- * @param qualifiedClassName
- * @param isServletType
- * @return Servlet instance
- */
- private Servlet createServlet(String qualifiedClassName, boolean isServletType) {
- // Get values from data model
- String displayName = model.getStringProperty(INewServletClassDataModelProperties.DISPLAY_NAME);
- String description = model.getStringProperty(INewServletClassDataModelProperties.DESCRIPTION);
-
- // Create the servlet instance and set up the parameters from data model
- Servlet servlet = WebapplicationFactory.eINSTANCE.createServlet();
- servlet.setDisplayName(displayName);
- servlet.setServletName(displayName);
- servlet.setDescription(description);
- // Handle servlet case
- if (isServletType) {
- ServletType servletType = WebapplicationFactory.eINSTANCE.createServletType();
- servletType.setClassName(qualifiedClassName);
- servlet.setWebType(servletType);
- }
- // Handle JSP case
- else {
- JSPType jspType = WebapplicationFactory.eINSTANCE.createJSPType();
- jspType.setJspFile(qualifiedClassName);
- servlet.setWebType(jspType);
- }
- // Add the servlet to the web application model
- WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
- webApp.getServlets().add(servlet);
- // Return the servlet instance
- return servlet;
- }
-
- /**
- * This method is intended for internal use only. This is used to create any init params
- * for the new servlet metadata. It will not accept null parameters. The init params are
- * set on the servlet modelled object.
- * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
- * @see WebapplicationFactory#createInitParam()
- *
- * @param initParamList
- * @param servlet
- */
- private void setUpInitParams(List initParamList, Servlet servlet) {
- // Get the web app instance from the data model
- WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
- int nP = initParamList.size();
- // If J2EE 1.4, add the param value and description info instances to the servlet init params
- if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID) {
- for (int iP = 0; iP < nP; iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create 1.4 common param value
- ParamValue param = CommonFactory.eINSTANCE.createParamValue();
- param.setName(stringArray[0]);
- param.setValue(stringArray[1]);
- // Create 1.4 common descripton value
- Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
- descriptionObj.setValue(stringArray[2]);
- // Set the description on the param
- param.getDescriptions().add(descriptionObj);
- param.setDescription(stringArray[2]);
- // Add the param to the servlet model list of init params
- servlet.getInitParams().add(param);
- }
- }
- // If J2EE 1.2 or 1.3, use the servlet specific init param instances
- else {
- for (int iP = 0; iP < nP; iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create the web init param
- InitParam ip = WebapplicationFactory.eINSTANCE.createInitParam();
- // Set the param name
- ip.setParamName(stringArray[0]);
- // Set the param value
- ip.setParamValue(stringArray[1]);
- // Set the param description
- ip.setDescription(stringArray[2]);
- // Add the init param to the servlet model list of params
- servlet.getParams().add(ip);
- }
- }
- }
-
- /**
- * This method is intended for internal use only. This method is used to create the servlet
- * mapping modelled objects so the metadata for the servlet mappings is store in the web
- * deployment descriptor. This method will not accept null parameters. The servlet mappings
- * are added to the web application modelled object.
- * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
- * @see WebapplicationFactory#createServletMapping()
- *
- * @param urlMappingList
- * @param servlet
- */
- private void setUpURLMappings(List urlMappingList, Servlet servlet) {
- // Get the web app modelled object from the data model
- WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
- int nM = urlMappingList.size();
- // Create the servlet mappings if any
- for (int iM = 0; iM < nM; iM++) {
- String[] stringArray = (String[]) urlMappingList.get(iM);
- // Create the servlet mapping instance from the web factory
- ServletMapping mapping = WebapplicationFactory.eINSTANCE.createServletMapping();
- // Set the servlet and servlet name
- mapping.setServlet(servlet);
- mapping.setName(servlet.getServletName());
- // Set the URL pattern to map the servlet to
- mapping.setUrlPattern(stringArray[0]);
- // Add the servlet mapping to the web application modelled list
- webApp.getServletMappings().add(mapping);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java
deleted file mode 100644
index 2dd2372..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java
+++ /dev/null
@@ -1,172 +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
- *******************************************************************************/
-/*
- * Created on Aug 6, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author jlanuti
- */
-public class CreateServletTemplateModel {
-
- IDataModel dataModel = null;
- public static final String INIT = "init"; //$NON-NLS-1$
- public static final String TO_STRING = "toString"; //$NON-NLS-1$
- public static final String GET_SERVLET_INFO = "getServletInfo"; //$NON-NLS-1$
- public static final String DO_POST = "doPost"; //$NON-NLS-1$
- public static final String DO_PUT = "doPut"; //$NON-NLS-1$
- public static final String DO_DELETE = "doDelete"; //$NON-NLS-1$
- public static final String DESTROY = "destroy"; //$NON-NLS-1$
- public static final String DO_GET = "doGet"; //$NON-NLS-1$
-
- public static final int NAME = 0;
- public static final int VALUE = 1;
- public static final int DESCRIPTION = 2;
-
- /**
- * Constructor
- */
- public CreateServletTemplateModel(IDataModel dataModel) {
- super();
- this.dataModel = dataModel;
- }
-
- public String getServletClassName() {
- return getProperty(INewJavaClassDataModelProperties.CLASS_NAME);
- }
-
- public String getJavaPackageName() {
- return getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
- }
-
- public String getQualifiedJavaClassName() {
- return getJavaPackageName() + "." + getServletClassName(); //$NON-NLS-1$
- }
-
- public String getSuperclassName() {
- return getProperty(INewJavaClassDataModelProperties.SUPERCLASS);
- }
-
- public String getServletName() {
- return getProperty(INewJavaClassDataModelProperties.CLASS_NAME);
- }
-
- public boolean isPublic() {
- return dataModel.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_PUBLIC);
- }
-
- public boolean isFinal() {
- return dataModel.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_FINAL);
- }
-
- public boolean isAbstract() {
- return dataModel.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT);
- }
-
- protected String getProperty(String propertyName) {
- return dataModel.getStringProperty(propertyName);
- }
-
- public boolean shouldGenInit() {
- return implementImplementedMethod(INIT);
- }
-
- public boolean shouldGenToString() {
- return implementImplementedMethod(TO_STRING);
- }
-
- public boolean shouldGenGetServletInfo() {
- return implementImplementedMethod(GET_SERVLET_INFO);
- }
-
- public boolean shouldGenDoPost() {
- return implementImplementedMethod(DO_POST);
- }
-
- public boolean shouldGenDoPut() {
- return implementImplementedMethod(DO_PUT);
- }
-
- public boolean shouldGenDoDelete() {
- return implementImplementedMethod(DO_DELETE);
- }
-
- public boolean shouldGenDestroy() {
- return implementImplementedMethod(DESTROY);
- }
-
- public boolean shouldGenDoGet() {
- return implementImplementedMethod(DO_GET);
- }
-
- public List getInitParams() {
- return (List) dataModel.getProperty(INewServletClassDataModelProperties.INIT_PARAM);
- }
-
- public String getInitParam(int index, int type) {
- List params = getInitParams();
- if (index < params.size()) {
- String[] stringArray = (String[]) params.get(index);
- return stringArray[type];
- }
- return null;
- }
-
- public List getServletMappings() {
- return (List) dataModel.getProperty(INewServletClassDataModelProperties.URL_MAPPINGS);
- }
-
- public String getServletMapping(int index) {
- List mappings = getServletMappings();
- if (index < mappings.size()) {
- String[] map = (String[]) mappings.get(index);
- return map[0];
- }
- return null;
- }
-
- public String getServletDescription() {
- return dataModel.getStringProperty(INewServletClassDataModelProperties.DESCRIPTION);
- }
-
- public List getInterfaces() {
- return (List) this.dataModel.getProperty(INewJavaClassDataModelProperties.INTERFACES);
- }
-
- protected boolean implementImplementedMethod(String methodName) {
- if (methodName.equals(INIT))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.INIT);
- else if (methodName.equals(TO_STRING))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.TO_STRING);
- else if (methodName.equals(GET_SERVLET_INFO))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.GET_SERVLET_INFO);
- else if (methodName.equals(DO_POST))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_POST);
- else if (methodName.equals(DO_PUT))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_PUT);
- else if (methodName.equals(DO_DELETE))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_DELETE);
- else if (methodName.equals(DESTROY))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DESTROY);
- else if (methodName.equals(DO_GET))
- return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_GET);
- else
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java
deleted file mode 100644
index cd739b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.web.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-
-public interface INewServletClassDataModelProperties extends INewJavaClassDataModelProperties, IAnnotationsDataModel {
- /**
- * Optional, boolean property used to specify whether to generate the init method.
- * The default is false.
- */
- public static final String INIT = "NewServletClassDataModel.INIT"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doPost method.
- * The default is true.
- */
- public static final String DO_POST = "NewServletClassDataModel.DO_POST"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the destroy method.
- * The default is false.
- */
- public static final String DESTROY = "NewServletClassDataModel.DESTROY"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the toString method.
- * The default is false.
- */
- public static final String TO_STRING = "NewServletClassDataModel.TO_STRING"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doPut method.
- * The default is false.
- */
- public static final String DO_PUT = "NewServletClassDataModel.DO_PUT"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doGet method.
- * The default is true.
- */
- public static final String DO_GET = "NewServletClassDataModel.DO_GET"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the getServletInfo method.
- * The default is false.
- */
- public static final String GET_SERVLET_INFO = "NewServletClassDataModel.GET_SERVLET_INFO"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doDelete method.
- * The default is false.
- */
- public static final String DO_DELETE = "NewServletClassDataModel.DO_DELETE"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to determine if building JSP or servlet.
- * The default is true.
- */
- public static final String IS_SERVLET_TYPE = "NewServletClassDataModel.IS_SERVLET_TYPE"; //$NON-NLS-1$
-
- /**
- * Optional, List property used to cache all the init params defined on the servlet.
- */
- public static final String INIT_PARAM = "NewServletClassDataModel.INIT_PARAM"; //$NON-NLS-1$
-
- /**
- * Optional, List propety used to cache all the servlet mappings for this servlet on the web application.
- */
- public static final String URL_MAPPINGS = "NewServletClassDataModel.URL_MAPPINGS"; //$NON-NLS-1$
-
- /**
- * Required, String property of the display name for the servlet
- */
- public static final String DISPLAY_NAME = "NewServletClassDataModel.DISPLAY_NAME"; //$NON-NLS-1$
-
- /**
- * Optional, String property of the description info for the servlet
- */
- public static final String DESCRIPTION = "NewServletClassDataModel.DESCRIPTION"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether or not to gen a new java class.
- * The default is false.
- */
- public static final String USE_EXISTING_CLASS = "NewServletClassDataModel.USE_EXISTING_CLASS"; //$NON-NLS-1$
-
- /**
- * Do not set! The javajet template file used in creating the annotated servlet template class
- */
- public static final String TEMPLATE_FILE = "NewServletClassDataModel.TEMPLATE_FILE"; //$NON-NLS-1$
-
- /**
- * Do not set! The javajet template file used in creating the non-annotated servlet template class
- */
- public static final String NON_ANNOTATED_TEMPLATE_FILE = "NewServletClassDataModel.NON_ANNOTATED_TEMPLATE_FILE"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
deleted file mode 100644
index 64a8a25..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
+++ /dev/null
@@ -1,566 +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.jst.j2ee.internal.web.operations;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * The NewServletClassDataModelProvider is a subclass of ArtifactEditOperationDataModelProvider and
- * follows the IDataModel Operation and Wizard frameworks.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- *
- * This data model provider is a subclass of the NewJavaClassDataModelProvider, which stores base
- * properties necessary in the creation of a default java class.
- * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider
- *
- * The NewServletClassDataModelProvider provides more specific properties for java class creation
- * that are required in creating a servlet java class. The data model provider is used to store
- * these values for the NewServletClassOperation.
- * @see org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties That
- * operation will create the servlet java class based on the settings defined here in the data
- * model.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassOperation
- *
- * This data model properties implements the IAnnotationsDataModel to get the USE_ANNOTATIONS
- * property for determining whether or not to generate an annotated java class.
- * @see org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel
- *
- * Clients can subclass this data model provider to cache and provide their own specific attributes.
- * They should also provide their own validation methods, properties interface, and default values
- * for the properties they add.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewServletClassDataModelProvider extends NewJavaClassDataModelProvider implements INewServletClassDataModelProperties {
-
- /**
- * The fully qualified default servlet superclass: HttpServlet.
- */
- private final static String SERVLET_SUPERCLASS = "javax.servlet.http.HttpServlet"; //$NON-NLS-1$
- /**
- * String array of the default, minimum required fully qualified Servlet interfaces
- */
- private final static String[] SERVLET_INTERFACES = {"javax.servlet.Servlet"}; //$NON-NLS-1$
-
- private final static String ANNOTATED_TEMPLATE_DEFAULT = "servletXDoclet.javajet"; //$NON-NLS-1$
-
- private final static String NON_ANNOTATED_TEMPLATE_DEFAULT = "servletXDocletNonAnnotated.javajet"; //$NON-NLS-1$
-
- /**
- * The cache of all the interfaces the servlet java class will implement.
- */
- private List interfaceList;
-
- private static boolean useAnnotations = true;
-
- /**
- * Subclasses may extend this method to provide their own default operation for this data model
- * provider. This implementation uses the AddServletOperation to drive the servlet creation. It
- * will not return null.
- *
- * @see IDataModel#getDefaultOperation()
- *
- * @return IDataModelOperation AddServletOperation
- */
- public IDataModelOperation getDefaultOperation() {
- return new AddServletOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to provide their own determination of whether or not
- * certain properties should be disabled or enabled. This method does not accept null parameter.
- * It will not return null. This implementation makes sure annotation support is only allowed on
- * web projects of J2EE version 1.3 or higher.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#isPropertyEnabled(String)
- * @see IAnnotationsDataModel#USE_ANNOTATIONS
- *
- * @param propertyName
- * @return boolean should property be enabled?
- */
- public boolean isPropertyEnabled(String propertyName) {
- // Annotations should only be enabled on a valid j2ee project of version 1.3 or higher
- if (USE_ANNOTATIONS.equals(propertyName)) {
- if (getBooleanProperty(USE_EXISTING_CLASS) || !isAnnotationsSupported())
- return false;
- return true;
- }
- // Otherwise return super implementation
- return super.isPropertyEnabled(propertyName);
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- // Add servlet specific properties defined in this data model
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(INIT);
- propertyNames.add(DO_POST);
- propertyNames.add(DESTROY);
- propertyNames.add(TO_STRING);
- propertyNames.add(DO_PUT);
- propertyNames.add(DO_GET);
- propertyNames.add(GET_SERVLET_INFO);
- propertyNames.add(DO_DELETE);
- propertyNames.add(IS_SERVLET_TYPE);
- propertyNames.add(INIT_PARAM);
- propertyNames.add(URL_MAPPINGS);
- propertyNames.add(USE_ANNOTATIONS);
- propertyNames.add(DISPLAY_NAME);
- propertyNames.add(DESCRIPTION);
- propertyNames.add(NON_ANNOTATED_TEMPLATE_FILE);
- propertyNames.add(TEMPLATE_FILE);
- propertyNames.add(USE_EXISTING_CLASS);
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to provide their own default values for any of the
- * properties in the data model hierarchy. This method does not accept a null parameter. It may
- * return null. This implementation sets annotation use to be true, and to generate a servlet
- * with doGet and doPost.
- *
- * @see NewJavaClassDataModelProvider#getDefaultProperty(String)
- * @see IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return Object default value of property
- */
- public Object getDefaultProperty(String propertyName) {
- // Generate a doPost method by default
- if (propertyName.equals(DO_POST))
- return Boolean.TRUE;
- // Generate a doGet method by default
- else if (propertyName.equals(DO_GET))
- return Boolean.TRUE;
- // Use servlet by default
- else if (propertyName.equals(IS_SERVLET_TYPE))
- return Boolean.TRUE;
- // Create an annotated servlet java class by default
- else if (propertyName.equals(USE_ANNOTATIONS))
- return shouldDefaultAnnotations();
- else if (propertyName.equals(DISPLAY_NAME)) {
- String className = getStringProperty(CLASS_NAME);
- if (className.endsWith(".jsp")) { //$NON-NLS-1$
- int index = className.lastIndexOf("/"); //$NON-NLS-1$
- className = className.substring(index+1,className.length()-4);
- } else {
- int index = className.lastIndexOf("."); //$NON-NLS-1$
- className = className.substring(index+1);
- }
- return className;
- }
- else if (propertyName.equals(URL_MAPPINGS))
- return getDefaultUrlMapping();
- else if (propertyName.equals(INTERFACES))
- return getServletInterfaces();
- else if (propertyName.equals(SUPERCLASS))
- return SERVLET_SUPERCLASS;
- else if (propertyName.equals(TEMPLATE_FILE))
- return ANNOTATED_TEMPLATE_DEFAULT;
- else if (propertyName.equals(NON_ANNOTATED_TEMPLATE_FILE))
- return NON_ANNOTATED_TEMPLATE_DEFAULT;
- else if (propertyName.equals(USE_EXISTING_CLASS))
- return Boolean.FALSE;
- // Otherwise check super for default value for property
- return super.getDefaultProperty(propertyName);
- }
-
- /**
- * Returns the default Url Mapping depending upon the display name of the Servlet
- *
- * @return List containting the default Url Mapping
- */
- private Object getDefaultUrlMapping() {
- List urlMappings = null;
- String text = (String) getProperty(DISPLAY_NAME);
- if (text != null) {
- urlMappings = new ArrayList();
- urlMappings.add(new String[]{"/" + text}); //$NON-NLS-1$
- }
- return urlMappings;
- }
-
- /**
- * Subclasses may extend this method to add their own specific behaviour when a certain property
- * in the data model heirarchy is set. This method does not accept null for the property name,
- * but it will for propertyValue. It will not return null. It will return false if the set
- * fails. This implementation verifies the display name is set to the classname, that the
- * annotations is disabled/enabled properly, and that the target project name is determined from
- * the source folder setting.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
- * Object)
- *
- * @param propertyName
- * @param propertyValue
- * @return boolean was property set?
- */
- public boolean propertySet(String propertyName, Object propertyValue) {
-
- // If annotations is changed, notify an enablement change
- if (propertyName.equals(USE_ANNOTATIONS)) {
- useAnnotations = ((Boolean) propertyValue).booleanValue();
- if (useAnnotations && !isAnnotationsSupported())
- return true;
- getDataModel().notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
- }
- // If the source folder is changed, ensure we have the correct project name
- if (propertyName.equals(SOURCE_FOLDER)) {
- // Get the project name from the source folder name
- String sourceFolder = (String) propertyValue;
- int index = sourceFolder.indexOf(File.separator);
- String projectName = sourceFolder;
- if (index == 0)
- projectName = sourceFolder.substring(1);
- index = projectName.indexOf(File.separator);
- if (index != -1) {
- projectName = projectName.substring(0, index);
- setProperty(PROJECT_NAME, projectName);
- }
- }
- // Call super to set the property on the data model
- boolean result = super.propertySet(propertyName, propertyValue);
- // If class name is changed, update the display name to be the same
- if (propertyName.equals(CLASS_NAME) && !getDataModel().isPropertySet(DISPLAY_NAME)) {
- getDataModel().notifyPropertyChange(DISPLAY_NAME, IDataModel.DEFAULT_CHG);
- }
- // After the property is set, if project changed, update the nature and the annotations
- // enablement
- if (propertyName.equals(COMPONENT_NAME)) {
- getDataModel().notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
- }
- // After property is set, if annotations is set to true, update its value based on the new
- // level of the project
- if (getBooleanProperty(USE_ANNOTATIONS)) {
- if (!isAnnotationsSupported())
- setBooleanProperty(USE_ANNOTATIONS, false);
- }
- if (propertyName.equals(USE_EXISTING_CLASS)) {
- getDataModel().notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
- if (((Boolean)propertyValue).booleanValue())
- setProperty(USE_ANNOTATIONS,Boolean.FALSE);
- setProperty(JAVA_PACKAGE, null);
- setProperty(CLASS_NAME, null);
- }
- // Return whether property was set
- return result;
- }
-
- protected boolean isAnnotationsSupported() {
-
- if (!getDataModel().isPropertySet(IArtifactEditOperationDataModelProperties.PROJECT_NAME))
- return true;
- if (getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME).equals("")) //$NON-NLS-1$
- return true;
- IProject project = ProjectUtilities.getProject(getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
- String moduleName = getStringProperty(IArtifactEditOperationDataModelProperties.COMPONENT_NAME);
- if (project == null || moduleName == null || moduleName.equals(""))return true; //$NON-NLS-1$
- WebArtifactEdit webEdit = null;
- try {
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(project);
- if (webEdit == null)
- return true;
- return webEdit.getJ2EEVersion() > J2EEVersionConstants.VERSION_1_2;
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (webEdit != null)
- webEdit.dispose();
- }
- }
-
- /**
- * Subclasses may extend this method to provide their own validation on any of the valid data
- * model properties in the hierarchy. This implementation adds validation for the init params,
- * servlet mappings, display name, and existing class fields specific to the servlet java class
- * creation. It does not accept a null parameter. This method will not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param propertyName
- * @return IStatus is property value valid?
- */
- public IStatus validate(String propertyName) {
- // If our default is the superclass, we know it is ok
- if (propertyName.equals(SUPERCLASS) && getStringProperty(propertyName).equals(SERVLET_SUPERCLASS))
- return WTPCommonPlugin.OK_STATUS;
- IStatus result = super.validate(propertyName);
- if (result != null && !result.isOK())
- return result;
- // Validate init params
- if (propertyName.equals(INIT_PARAM))
- return validateInitParamList((List) getProperty(propertyName));
- // Validate servlet mappings
- if (propertyName.equals(URL_MAPPINGS))
- return validateURLMappingList((List) getProperty(propertyName));
- // Validate the servlet name in DD
- if (propertyName.equals(DISPLAY_NAME))
- return validateDisplayName(getStringProperty(propertyName));
- if (propertyName.equals(CLASS_NAME)) {
- result = validateJavaClassName(getStringProperty(propertyName));
- if (result.isOK()&&!getBooleanProperty(USE_EXISTING_CLASS))
- result = canCreateTypeInClasspath(getStringProperty(CLASS_NAME));
- return result;
- }
- // Otherwise defer to super to validate the property
- return result;
- }
-
- /**
- * Subclasses may extend this method to provide their own validation of the specified java
- * classname. This implementation will ensure the class name is not set to Servlet and then will
- * forward on to the NewJavaClassDataModel to validate the class name as valid java. This method
- * does not accept null as a parameter. It will not return null.
- *
- * @see NewServletClassDataModelProvider#validateExistingClass(boolean)
- * @see NewJavaClassDataModelProvider#validateJavaClassName(String)
- *
- * @param className
- * @return IStatus is java classname valid?
- */
- protected IStatus validateJavaClassName(String className) {
- if (getBooleanProperty(USE_EXISTING_CLASS))
- return WTPCommonPlugin.OK_STATUS;
- // First use the NewJavaClassDataModel to validate the classname as proper java syntax
- IStatus status = super.validateJavaClassName(className);
- if (status.isOK()) {
- // Do not allow the name to be "Servlet"
- if (className.equals("Servlet")) { //$NON-NLS-1$
- String msg = WebMessages.ERR_SERVLET_JAVA_CLASS_NAME_INVALID;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
- // Return the status
- return status;
- }
-
- /**
- * This method is intended for internal use only. It will be used to validate the init params
- * list to ensure there are not any duplicates. This method will accept a null paramter. It will
- * not return null.
- *
- * @see NewServletClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is init params list valid?
- */
- private IStatus validateInitParamList(List prop) {
- if (prop != null && !prop.isEmpty()) {
- // Ensure there are not duplicate entries in the list
- boolean dup = hasDuplicatesInStringArrayList(prop);
- if (dup) {
- String msg = WebMessages.ERR_DUPLICATED_INIT_PARAMETER;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- // Return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This method is intended for internal use only. This will validate the servlet mappings list
- * and ensure there are not duplicate entries. It will accept a null parameter. It will not
- * return null.
- *
- * @see NewServletClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is servlet mapping list valid?
- */
- private IStatus validateURLMappingList(List prop) {
- if (prop != null && !prop.isEmpty()) {
- // Ensure there are not duplicates in the mapping list
- boolean dup = hasDuplicatesInStringArrayList(prop);
- if (dup) {
- String msg = WebMessages.ERR_DUPLICATED_URL_MAPPING;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } else {
- String msg = WebMessages.ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This method is intended for internal use only. It provides a simple algorithm for detecting
- * if there are duplicate entries in a list. It will accept a null paramter. It will not return
- * null.
- *
- * @see NewServletClassDataModelProvider#validateInitParamList(List)
- * @see NewServletClassDataModelProvider#validateURLMappingList(List)
- *
- * @param input
- * @return boolean are there dups in the list?
- */
- private boolean hasDuplicatesInStringArrayList(List input) {
- // If list is null or empty return false
- if (input == null)
- return false;
- int n = input.size();
- boolean dup = false;
- // nested for loops to check each element to see if other elements are the same
- for (int i = 0; i < n; i++) {
- String[] sArray1 = (String[]) input.get(i);
- for (int j = i + 1; j < n; j++) {
- String[] sArray2 = (String[]) input.get(j);
- if (isTwoStringArraysEqual(sArray1, sArray2)) {
- dup = true;
- break;
- }
- }
- if (dup)
- break;
- }
- // Return boolean status for duplicates
- return dup;
- }
-
- /**
- * This method is intended for internal use only. This checks to see if the two string arrays
- * are equal. If either of the arrays are null or empty, it returns false.
- *
- * @see NewServletClassDataModelProvider#hasDuplicatesInStringArrayList(List)
- *
- * @param sArray1
- * @param sArray2
- * @return boolean are Arrays equal?
- */
- private boolean isTwoStringArraysEqual(String[] sArray1, String[] sArray2) {
- // If either array is null, return false
- if (sArray1 == null || sArray2 == null)
- return false;
- int n1 = sArray1.length;
- int n2 = sArray1.length;
- // If either array is empty, return false
- if (n1 == 0 || n2 == 0)
- return false;
- // If they don't have the same length, return false
- if (n1 != n2)
- return false;
- // If their first elements do not match, return false
- if (!sArray1[0].equals(sArray2[0]))
- return false;
- // Otherwise return true
- return true;
- }
-
- /**
- * This method will return the list of servlet interfaces to be implemented for the new servlet
- * java class. It will intialize the list using lazy initialization to the minimum interfaces
- * required by the data model SERVLET_INTERFACES. This method will not return null.
- *
- * @see INewServletClassDataModelProperties#SERVLET_INTERFACES
- *
- * @return List of servlet interfaces to be implemented
- */
- private List getServletInterfaces() {
- if (interfaceList == null) {
- interfaceList = new ArrayList();
- // Add minimum required list of servlet interfaces to be implemented
- for (int i = 0; i < SERVLET_INTERFACES.length; i++) {
- interfaceList.add(SERVLET_INTERFACES[i]);
- }
- }
- // Return interface list
- return interfaceList;
- }
-
- /**
- * This method is intended for internal use only. This will validate whether the display name
- * selected is a valid display name for the servlet in the specified web application. It will
- * make sure the name is not empty and that it doesn't already exist in the web app. This method
- * will accept null as a parameter. It will not return null.
- *
- * @see NewServletClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is servlet display name valid?
- */
- private IStatus validateDisplayName(String prop) {
- // Ensure the servlet display name is not null or empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = WebMessages.ERR_DISPLAY_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (getTargetProject() == null || getTargetComponent() == null)
- return WTPCommonPlugin.OK_STATUS;
- ArtifactEdit edit = null;
- try {
- edit = getArtifactEditForRead();
- if (edit == null)
- return WTPCommonPlugin.OK_STATUS;
- WebApp webApp = (WebApp) edit.getContentModelRoot();
- if (webApp == null)
- return WTPCommonPlugin.OK_STATUS;
- List servlets = webApp.getServlets();
- boolean exists = false;
- // Ensure the display does not already exist in the web application
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- String name = ((Servlet) servlets.get(i)).getServletName();
- if (prop.equals(name))
- exists = true;
- }
- }
- // If the servlet name already exists, throw an error
- if (exists) {
- String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_DISPLAY_NAME_EXIST, new String[]{prop});
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
-
- // Otherwise, return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * @return boolean should the default annotations be true?
- */
- private static Boolean shouldDefaultAnnotations() {
- if (useAnnotations)
- return Boolean.TRUE;
- return Boolean.FALSE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java
deleted file mode 100644
index 4963a7d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java
+++ /dev/null
@@ -1,393 +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.jst.j2ee.internal.web.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.codegen.jet.JETEmitter;
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaModelMarker;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager.Descriptor;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.WTPJETEmitter;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * The NewServletClassOperation is an IDataModelOperation following the IDataModel wizard and
- * operation framework.
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends ArtifactEditProviderOperation to provide servlet specific java class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * This operation is used by the AddServletOperation to generate either an annotated or
- * non annotated java class for an added servlet. It shares the NewServletClassDataModelProvider
- * with the AddServletOperation to store the appropriate properties required to generate
- * the new servlet.
- * @see org.eclipse.jst.j2ee.internal.web.operations.AddServletOperation
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider
- *
- * In the annotated case, a WTPJetEmitter servlet template is created and used to generate the
- * servlet java class with the embedded annotated tags.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.internal.web.operations.CreateServletTemplateModel
- *
- * In the non annotated case, the same emitter is used to create the class with the non annotated
- * servlet template so the annotated tags are omitted.
- *
- * Subclasses may extend this operation to provide their own specific servlet java class generation.
- * The execute method may be extended to do so. Also, generateUsingTemplates is exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewServletClassOperation extends ArtifactEditProviderOperation {
-
- /**
- * XDoclet facet constants
- */
- private static final String JST_WEB_XDOCLET_VERSION = "1.2.3";
- private static final String JST_WEB_XDOCLET = "jst.web.xdoclet";
-
- private static final String WEB_PLUGIN_JAR = "org.eclipse.jst.j2ee.web_1.0.0.jar"; //$NON-NLS-1$
- /**
- * The extension name for a java class
- */
- private static final String DOT_JAVA = ".java"; //$NON-NLS-1$
- /**
- * platform plugin beginning for URI string
- */
-// private static final String PLATFORM_PLUGIN = "platform:/plugin/"; //$NON-NLS-1$
-
- /**
- * variable for the web plugin
- */
- protected static final String WEB_PLUGIN = "WEB_PLUGIN"; //$NON-NLS-1$
- /**
- * folder location of the servlet creation templates diretory
- */
- protected static final String TEMPLATE_DIR = "/templates/"; //$NON-NLS-1$
- /**
- * name of the template emitter to be used to generate the deployment descriptor from the tags
- */
- protected static final String TEMPLATE_EMITTER = "org.eclipse.jst.j2ee.ejb.annotations.emitter.template"; //$NON-NLS-1$
- /**
- * id of the builder used to kick off generation of web metadata based on parsing of annotations
- */
- protected static final String BUILDER_ID = "builderId"; //$NON-NLS-1$
-
- /**
- * This is the constructor which should be used when creating a NewServletClassOperation. An instance of
- * the NewServletClassDataModel should be passed in. This does not accept null parameter. It will
- * not return null.
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewServletClassDataModel
- *
- * @param dataModel
- * @return NewServletClassOperation
- */
- public NewServletClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * Subclasses may extend this method to add their own actions during execution.
- * The implementation of the execute method drives the running of the operation.
- * This implemenatation will create the java source folder, create the java package,
- * and then if using annotations, will use templates to generate an annotated servlet
- * java class, or if it is not annotated, the servlet java class file will be created
- * without the annotated tags using templates.
- * Optionally, subclasses may extend the generateUsingTemplates or createJavaFile method
- * rather than extend the execute method. This method will accept a null paramter.
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor, IPackageFragment)
- *
- * @param monitor
- * @throws CoreException
- * @throws InterruptedException
- * @throws InvocationTargetException
- */
- public IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // Create source folder if it does not exist
- createJavaSourceFolder();
- // Create java package if it does not exist
- IPackageFragment pack = createJavaPackage();
- // Generate using templates
- try {
- generateUsingTemplates(monitor, pack);
- } catch (Exception e) {
- return WTPCommonPlugin.createErrorStatus(e.toString());
- }
- return OK_STATUS;
- }
-
- /**
- * This method will return the java package as specified by the new java class data model.
- * If the package does not exist, it will create the package. This method should not return
- * null.
- * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
- * @see IPackageFragmentRoot#createPackageFragment(java.lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor)
- *
- * @return IPackageFragment the java package
- */
- protected final IPackageFragment createJavaPackage() {
- // Retrieve the package name from the java class data model
- String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
- IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
- IPackageFragment pack = packRoot.getPackageFragment(packageName);
- // Handle default package
- if (pack == null) {
- pack = packRoot.getPackageFragment(""); //$NON-NLS-1$
- }
- // Create the package fragment if it does not exist
- if (!pack.exists()) {
- String packName = pack.getElementName();
- try {
- pack = packRoot.createPackageFragment(packName, true, null);
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- }
- // Return the package
- return pack;
- }
-
- /**
- * Subclasses may extend this method to provide their own template based creation
- * of an annotated servlet java class file. This implementation uses the creation of
- * a CreateServletTemplateModel and the WTPJetEmitter to create the java class with the
- * annotated tags. This method accepts null for monitor, it does not accept null for
- * fragment. If annotations are not being used the tags will be omitted from the class.
- * @see CreateServletTemplateModel
- * @see NewServletClassOperation#generateTemplateSource(CreateServletTemplateModel, IProgressMonitor)
- *
- * @param monitor
- * @param fragment
- * @throws CoreException
- * @throws WFTWrappedException
- */
- protected void generateUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment) throws WFTWrappedException, CoreException {
- // Create the servlet template model
- CreateServletTemplateModel tempModel = createTemplateModel();
- IProject project = getTargetProject();
- String source;
- // Using the WTPJetEmitter, generate the java source based on the servlet template model
- try {
- source = generateTemplateSource(tempModel, monitor);
- } catch (Exception e) {
- throw new WFTWrappedException(e);
- }
- if (fragment != null) {
- // Create the java file
- String javaFileName = tempModel.getServletClassName() + DOT_JAVA;
- ICompilationUnit cu = fragment.getCompilationUnit(javaFileName);
- // Add the compilation unit to the java file
- if (cu == null || !cu.exists())
- cu = fragment.createCompilationUnit(javaFileName, source, true, monitor);
- IFile aFile = (IFile) cu.getResource();
- // Let the annotations controller process the annotated resource
- AnnotationsController controller = AnnotationsControllerManager.INSTANCE.getAnnotationsController(project);
- if (controller != null)
- controller.process(aFile);
- //((J2EEEditModel)model.getEditModel()).getWorkingCopy(cu, true); //Track CU.
- }
- // Add the annotations builder to the java project so metadata can be generated.
- //TODO for M4 cannot add builder directly here, needs to be set up more extensibly
- addAnnotationsBuilder(monitor,project);
- }
-
- /**
- * This method is intended for internal use only. This method will add the annotations builder
- * for Xdoclet to the targetted project. This needs to be removed from the operation and set
- * up to be more extensible throughout the workbench.
- * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor, IPackageFragment)
- *
- *
- */
- private void addAnnotationsBuilder(IProgressMonitor monitor, IProject project) {
- // If an extended annotations processor is added, ignore the default
- // xdoclet one
- Descriptor descriptor = AnnotationsControllerManager.INSTANCE.getDescriptor(getTargetComponent().getProject());
- if (descriptor != null)
- return;
- try {
- // Add the xdoclet facet.
- //
-
- installXDocletFacet(monitor, project);
-
- } catch (Exception e) {
- // Ignore
- }
- }
-
- /**
- * This method is intended for internal use only. This will add an webdoclet
- * facet to the project.
- * @throws CoreException
- * @throws ExecutionException
- *
- */
- private void installXDocletFacet(IProgressMonitor monitor, IProject project) throws CoreException, ExecutionException {
-
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- Set facets = facetedProject.getProjectFacets();
- Set fixedFacets = facetedProject.getFixedProjectFacets();
- boolean shouldInstallFacet = true;
- for (Iterator iter = facets.iterator(); iter.hasNext();) {
- IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
- String facetID = facetVersion.getProjectFacet().getId();
- if (JST_WEB_XDOCLET.equals(facetID)) {
- shouldInstallFacet = false;
- }
- }
- if (!shouldInstallFacet)
- return;
-
- IDataModel dm = DataModelFactory.createDataModel(new FacetInstallDataModelProvider());
- dm.setProperty(IFacetDataModelProperties.FACET_ID, JST_WEB_XDOCLET);
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, JST_WEB_XDOCLET_VERSION); //$NON-NLS-1$
- IDataModel fdm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- fdm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, project.getName());
-
- FacetDataModelMap map = (FacetDataModelMap) fdm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(dm);
-
- fdm.getDefaultOperation().execute(monitor, null);
- facetedProject.setFixedProjectFacets(fixedFacets);
-
- }
- /**
- * This method is intended for internal use only. This will use the WTPJETEmitter to create
- * an annotated java file based on the passed in servlet class template model. This method
- * does not accept null parameters. It will not return null. If annotations are not used,
- * it will use the non annotated template to omit the annotated tags.
- * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor, IPackageFragment)
- * @see JETEmitter#generate(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object[])
- * @see CreateServletTemplateModel
- *
- * @param tempModel
- * @param monitor
- * @return String the source for the java file
- * @throws JETException
- */
- private String generateTemplateSource(CreateServletTemplateModel tempModel, IProgressMonitor monitor) throws JETException {
- URL templateURL = null;
- // If annotated, use annotated template
- if (model.getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS))
- templateURL = WebPlugin.getDefault().find(new Path(TEMPLATE_DIR+getDataModel().getStringProperty(INewServletClassDataModelProperties.TEMPLATE_FILE)));
- // Otherwise use non annotated template
- else
- templateURL = WebPlugin.getDefault().find(new Path(TEMPLATE_DIR+getDataModel().getStringProperty(INewServletClassDataModelProperties.NON_ANNOTATED_TEMPLATE_FILE)));
- cleanUpOldEmitterProject();
- WTPJETEmitter emitter = new WTPJETEmitter(templateURL.toString(), this.getClass().getClassLoader());
- emitter.setIntelligentLinkingEnabled(true);
- emitter.addVariable(WEB_PLUGIN, WebPlugin.PLUGIN_ID);
- return emitter.generate(monitor, new Object[]{tempModel});
- }
-
- private void cleanUpOldEmitterProject() {
- IProject project = ProjectUtilities.getProject(WTPJETEmitter.PROJECT_NAME);
- if (project == null || !project.exists())
- return;
- try {
- IMarker[] markers = project.findMarkers(IJavaModelMarker.BUILDPATH_PROBLEM_MARKER, false, IResource.DEPTH_ZERO);
- for (int i = 0, l = markers.length; i < l; i++) {
- if (((Integer) markers[i].getAttribute(IMarker.SEVERITY)).intValue() == IMarker.SEVERITY_ERROR) {
- project.delete(true,new NullProgressMonitor());
- break;
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * This method is intended for internal use only. This method will create an instance of the
- * CreateServletTemplate model to be used in conjunction with the WTPJETEmitter. This method
- * will not return null.
- * @see CreateServletTemplateModel
- * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor, IPackageFragment)
- *
- * @return CreateServletTemplateModel
- */
- private CreateServletTemplateModel createTemplateModel() {
- // Create the CreateServletTemplateModel instance with the new servlet class data model
- CreateServletTemplateModel templateModel = new CreateServletTemplateModel(model);
- return templateModel;
- }
-
- /**
- * This method will return the java source folder as specified in the java class data model.
- * It will create the java source folder if it does not exist. This method may return null.
- * @see INewJavaClassDataModelProperties#SOURCE_FOLDER
- * @see IFolder#create(boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
- *
- * @return IFolder the java source folder
- */
- protected final IFolder createJavaSourceFolder() {
- // Get the source folder name from the data model
- String folderFullPath = model.getStringProperty(INewJavaClassDataModelProperties.SOURCE_FOLDER);
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IFolder folder = root.getFolder(new Path(folderFullPath));
- // If folder does not exist, create the folder with the specified path
- if (!folder.exists()) {
- try {
- folder.create(true, true, null);
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- }
- }
- // Return the source folder
- return folder;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java
deleted file mode 100644
index ae2e896..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java
+++ /dev/null
@@ -1,119 +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
- *******************************************************************************/
-/*
- * Created on Jan 13, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebMessages extends NLS {
- private static final String BUNDLE_NAME = "web";//$NON-NLS-1$
-
- private WebMessages() {
- // Do not instantiate
- }
-
- public static String ERR_JAR_NAME_EMPTY;
- public static String ERR_JAR_NAME_EXIST;
- public static String ERR_JAVA_PROJECT_NAME_EMPTY;
- public static String ERR_JAVA_PROJECT_NAME_EXIST;
- public static String ERR_DUPLICATED_INIT_PARAMETER;
- public static String ERR_DUPLICATED_URL_MAPPING;
-
- public static String ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY;
- public static String ERR_SERVLET_MAPPING_URL_PATTERN_EXIST;
- public static String KEY_3;
- public static String KEY_4;
- public static String KEY_5;
- public static String KEY_6;
- public static String ERR_FILTER_PARAMETER_NAME_EXIST;
- public static String ERR_FILTER_MAPPING_SERVLET_EXIST;
- public static String ERR_FILTER_MAPPING_SERVLET_DISPATCHER_TYPES_EMPTY;
- public static String ERR_DISPLAY_NAME_EMPTY;
- public static String ERR_SERVLET_NAME_EXIST;
- public static String ERR_SERVLET_DISPLAY_NAME_EXIST;
- public static String ERR_SERVLET_CLASS_NAME_USED;
- public static String ERR_SERVLET_JAVA_CLASS_NAME_INVALID;
- public static String ERR_SERVLET_MAPPING_SERVLET_NOT_EXIST;
- public static String ERR_SERVLET_PARAMETER_NAME_EMPTY;
- public static String ERR_SERVLET_PARAMETER_NAME_EXIST;
- public static String ERR_SERVLET_PARAMETER_VALUE_EMPTY;
- public static String ERR_SERVLET_PARAMETER_VALUE_EXIST;
- public static String ERR_SERVLET_ROLE_REF_NAME_EMPTY;
- public static String ERR_SERVLET_ROLE_REF_NAME_EXIST;
- public static String ERR_SERVLET_ROLE_LINK_EMPTY;
-
- public static String ERR_FILTER_DISPLAY_NAME_EXIST;
- public static String ERR_FILTER_CLASS_NAME_USED;
- public static String ERR_FILTER_CLASS_NAME_INVALID;
- public static String ERR_LISTENER_DISPLAY_NAME_EXIST;
- public static String ERR_LISTENER_CLASS_NAME_USED;
- public static String ERR_LISTENER_CLASS_NAME_INVALID;
-
- public static String ERR_PAGE_ENCODING_EMPTY;
- public static String ERR_PAGE_ENCODING_EXIST;
- public static String ERR_URL_PATTERN_EXIST;
- public static String ERR_INCLUDE_PRELUDES_EXIST;
- public static String ERR_INCLUDE_CODAS_EXIST;
- public static String ERR_SECURITY_CONSTRAINT_NAME_EMPTY;
- public static String ERR_SECURITY_CONSTRAINT_NAME_EXIST;
- public static String ERR_CONTEXT_PARAMETER_NAME_EMPTY;
- public static String ERR_CONTEXT_PARAMETER_NAME_EXIST;
- public static String ERR_RESOURCE_NAME_EMPTY;
- public static String ERR_RESOURCE_NAME_EXIST;
- public static String ERR_URL_PATTERNS_EMPTY;
- public static String ERR_MIME_MAPPING_EXTENSION_EMPTY;
- public static String ERR_MIME_MAPPING_EXTENSION_EXIST;
- public static String ERR_WELCOME_PAGE_EMPTY;
- public static String ERR_WELCOME_PAGE_EXIST;
- public static String ERR_ENV_ENTRY_NAME_EMPTY;
- public static String ERR_ENV_ENTRY_NAME_EXIST;
- public static String ERR_ERROR_CODE_EMPTY;
- public static String ERR_ERROR_CODE_MUST_BE_3_DIGITS;
- public static String ERR_ERROR_PAGE_LOCATION_EMPTY;
- public static String ERR_ERROR_PAGE_LOCATION_EXIST;
- public static String ERR_ERROR_PAGE_LOCATION_MUST_START_WITH_SLASH;
- public static String ERR_EXCEPTION_TYPE_EMPTY;
- public static String ERR_EXCEPTION_SECURITY_ID_NO_BEANS;
- public static String ERR_EXCEPTION_ROLE_NAME_EMPTY;
- public static String ERR_LOCALE_NAME_EMPTY;
- public static String ERR_LOCALE_NAME_EXIST;
- public static String ERR_TAGLIBREF_URL_EMPTY;
- public static String ERR_TAGLIBREF_URL_EXIST;
- public static String ERR_MESSAGE_DESTINATION_NAME_EMPTY;
- public static String ERR_MESSAGE_DESTINATION_NAME_EXIST;
- public static String ERR_EXCEPTION_METHOD_ELEMENT_EMPTY;
- public static String ERR_EXCEPTION_METHOD_TRANSACTION_ATTRIBUTES_EMPTY;
- public static String ERR_SERVLET_LIST_EMPTY;
- public static String ERR_FILTER_LIST_EMPTY;
- public static String ERR_LISTENER_LIST_EMPTY;
-
- public static String WEB_CONT_DESCRIPTION;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WebMessages.class);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java
deleted file mode 100644
index 52d3f91..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java
+++ /dev/null
@@ -1,196 +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
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.web.plugin;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension;
-import org.eclipse.jst.j2ee.internal.project.J2EEJavaProjectInfo;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-public class WebModuleExtensionImpl extends EarModuleExtensionImpl implements WebModuleExtension {
-
- /**
- *
- */
- public WebModuleExtensionImpl() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#createProjectInfo()
- */
- public J2EEJavaProjectInfo createProjectInfo() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#addWLPProjects(org.eclipse.core.resources.IProject,
- * java.util.Set)
- */
- public void addWLPProjects(IProject aProject, Set projectsToBuild) {
- // J2EEWebNatureRuntime nature = J2EEWebNatureRuntime.getRuntime(aProject);
- // if (nature == null)
- // return;
- // ILibModule[] libModules = nature.getLibModules();
- // for (int i = 0; i < libModules.length; i++) {
- // IProject p = libModules[i].getProject();
- // if (p.isAccessible())
- // projectsToBuild.add(libModules[i].getProject());
- // }
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#setContextRootForModuleMapping(org.eclipse.jst.j2ee.internal.internal.application.WebModule,
- * org.eclipse.core.resources.IProject)
- */
- public void setContextRootForModuleMapping(WebModule webModule, IProject nestedProject) throws CoreException {
- WebArtifactEdit webEdit = null;
- try {
- // TODO migrate to flex project
- // webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead( nestedProject
- // );
- if (webEdit != null) {
- webEdit.setServerContextRoot(webModule.getContextRoot());
- }
- } finally {
- if (webEdit != null)
- webEdit.dispose();
- }
- // if (wnr != null) {
- // wnr.setContextRoot(webModule.getContextRoot());
- // }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#hasRuntime(org.eclipse.core.resources.IProject)
- */
- public boolean hasRuntime(IProject project) {
- // return J2EEWebNatureRuntimeUtilities.hasJ2EERuntime(project);
- // To do: work based on module
- return false;
- }
-
- // public J2EEImportOperationOLD createImportOperation(IProject
- // nestedProject, WARFile warFile, EARImportConfiguration importConfig){
- // WarImportOperation op = new WarImportOperation(nestedProject, warFile);
- // //op.setServerTarget(info.getServerTarget());
- // HashMap opMap = importConfig.createProjectOption;
- // if(opMap != null && !opMap.isEmpty())
- // op.createWLProjectOptions = opMap;
- // return op;
- // }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#getContentFolder(org.eclipse.core.resources.IProject,
- * org.eclipse.jst.j2ee.internal.internal.commonarchivecore.File)
- */
-
- public String getContentFolder(IProject project, IFile webSettingsFile) {
- String contentFolder = null;
-
- // WebSettings webSettings = new WebSettings(project, webSettingsFile);
- // if (webSettings != null) {
- // contentFolder = webSettings.getWebContentName();
- // }
- // To do: Needs work here, no content folder exists now
- WebArtifactEdit webEdit = null;
- try {
- // TODO migrate to flex project
- // webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead(project);
- if (webEdit != null) {
-
- }
- } finally {
- if (webEdit != null)
- webEdit.dispose();
- }
-
- return contentFolder;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#compareWebContextRoot(org.eclipse.jst.j2ee.internal.internal.application.Module,
- * org.eclipse.core.resources.IProject)
- */
- public boolean compareWebContextRoot(Module module, IProject project) throws CoreException {
- String contextRoot = ((WebModule) module).getContextRoot();
- if (contextRoot != null)
- return ((contextRoot).equals(getServerContextRoot(project)));
- return false;
- }
-
- protected String getServerContextRoot(IProject project) {
- WebArtifactEdit webEdit = null;
- try {
- // TODO migrate to flex project
- // webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead(project);
- if (webEdit != null) {
- return webEdit.getServerContextRoot();
- }
- } finally {
- if (webEdit != null)
- webEdit.dispose();
- }
- return ""; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectDataModel()
- */
- public IDataModel createProjectDataModel() {
- return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createImportDataModel()
- */
- public IDataModel createImportDataModel() {
- return DataModelFactory.createDataModel(new WebComponentImportDataModelProvider());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
deleted file mode 100644
index 3aedb61..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
+++ /dev/null
@@ -1,297 +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.jst.j2ee.internal.web.plugin;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.jst.j2ee.internal.web.util.WebEditAdapterFactory;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppResourceFactory;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- *
- */
-
-public class WebPlugin extends WTPPlugin implements ResourceLocator {
- // Default instance of the receiver
- private static WebPlugin inst;
- protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
- // Links View part of the plugin
- //public static final String LINKS_BUILDER_ID =
- // "com.ibm.etools.links.management.linksbuilder";//$NON-NLS-1$
- public static final String LINKS_BUILDER_ID = "com.ibm.etools.webtools.additions.linksbuilder"; //$NON-NLS-1$
- // LibDir Change Listener
- public static final String LIBDIRCHANGE_BUILDER_ID = "com.ibm.etools.webtools.LibDirBuilder"; //$NON-NLS-1$
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.web"; //$NON-NLS-1$
- // LibCopy builder ID
- public static final String LIBCOPY_BUILDER_ID = "org.eclipse.jst.j2ee.LibCopyBuilder"; //$NON-NLS-1$
- // Validation part of the plugin
- //Global ResourceSet (somewhat global)
- private static IPath location;
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/cview16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/clcl16", //$NON-NLS-1$
- "icons/full/ovr16", //$NON-NLS-1$
- "icons/full/extra", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- /**
- * Create the J2EE plugin and cache its default instance
- */
- public WebPlugin() {
- super();
- if (inst == null)
- inst = this;
- }
-
- /**
- * Get the plugin singleton.
- */
- static public WebPlugin getDefault() {
- return inst;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public URL getBaseURL() {
- return getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- public Object[] getJ2EEWebProjectMigrationExtensions() {
-
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint pct = registry.getExtensionPoint(getBundle().getSymbolicName(), "J2EEWebProjectMigrationExtension"); //$NON-NLS-1$
-
- IExtension[] extension = pct.getExtensions();
- List ret = new Vector();
- for (int l = 0; l < extension.length; ++l) {
- IExtension config = extension[l];
-
- IConfigurationElement[] cElems = config.getConfigurationElements();
- for (int i = 0; i < cElems.length; i++) {
- IConfigurationElement d = cElems[i];
- if (d.getName().equals("migration")) { //$NON-NLS-1$
- try {
- Object me = d.createExecutableExtension("run"); //$NON-NLS-1$
-
- ret.add(me);
- } catch (Exception ex) {
- // ignore this extension, keep going
- }
- }
- }
- }
-
- return ret.toArray();
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public Object getImage(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
- public static IPath getInstallLocation() {
- if (location == null) {
- URL url = getInstallURL();
- try {
- String installLocation = ((PlatformURLConnection) url.openConnection()).getURLAsLocal().getFile();
- location = new Path(installLocation);
- } catch (IOException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{url}) + e); //$NON-NLS-1$
- }
- }
- return location;
- }
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- /**
- * Get the singleton instance.
- */
- public static WebPlugin getPlugin() {
- return inst;
- }
-
- /**
- * Return the plugin directory location- the directory that all the plugins are located in (i.e.
- * d:\installdir\plugin)
- */
- public static IPath getPluginLocation(String pluginId) {
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null) {
- try {
- IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator(); //$NON-NLS-1$
- String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
- return new Path(installStr);
- } catch (IOException e) {
- //Do nothing
- }
- }
- return null;
- }
-
- /**
- * Return the Servlets Jar file path preference.
- *
- * @return String the file path to the servlets jar, or null if never specified.
- * @deprecated - the preference store is no longer on this plugin because of the UI dependency.
- */
- public String getPreferenceServletsJar() {
- // return getPreferenceStore().getString(IWebToolingCoreConstants.PROP_SERVLET_JAR);
- return "THIS IS THE WRONG PATH - NEED TO CHANGE IMPLEMENTATION!!!!!"; //$NON-NLS-1$
- }
-
- /**
- * Return the Servlets Jar file path preference.
- *
- * @return String the file path to the servlets jar, or null if never specified.
- * @deprecated - the preference store is no longer on this plugin because of the UI dependency.
- */
- public String getPreferenceWebASJar() {
- //return getPreferenceStore().getString(IWebToolingCoreConstants.PROP_WEBAS_JAR);
- return "THIS IS THE WRONG PATH - NEED TO CHANGE IMPLEMENTATION!!!!!"; //$NON-NLS-1$
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus newErrorStatus(int aCode, String aMessage, Throwable exception) {
- return newStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus newErrorStatus(String aMessage, Throwable exception) {
- return newErrorStatus(0, aMessage, exception);
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation.
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus newOperationFailedStatus(String aMessage, Throwable exception) {
- return newStatus(IStatus.ERROR, IResourceStatus.OPERATION_FAILED, aMessage, exception);
- }
-
- /**
- * Create a new IStatus with a severity using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus newStatus(int severity, int aCode, String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode, aMessage, exception);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key) {
- return Platform.getResourceString(getBundle(), key);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key, Object[] substitutions) {
- return MessageFormat.format(getString(key), substitutions);
- }
-
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- WebAppResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- IAdapterManager manager = Platform.getAdapterManager();
- manager.registerAdapters(new WebEditAdapterFactory(), ArtifactEditModel.class);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- public static void log( final Exception e )
- {
- final ILog log = WebPlugin.getDefault().getLog();
- final String msg = "Encountered an unexpected exception.";
-
- log.log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
deleted file mode 100644
index 82553e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
+++ /dev/null
@@ -1,225 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}
- * object.
- */
-public class AuthConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public AuthConstraintItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns authority_constraint.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("authority_constraint");//$NON-NLS-1$
- }
-
- /**
- * This returns the secConstraint of the AuthConstraint.
- */
- public Object getParent(Object object) {
- return ((AuthConstraint) object).getSecConstraint();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getAuthConstraint_Description()));
- // This is for the roles feature.
- //
- WebToolingItemPropertyDescriptor propertyDescriptor = new WebToolingItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Roles_UI_"), //$NON-NLS-1$ = "Roles"
- WebAppEditResourceHandler.getString("The_roles_property_UI_"), //$NON-NLS-1$ = "The roles property"
- pkg.getAuthConstraint_Roles(), WebToolingItemPropertyDescriptor.AUTH_CONSTRAINT_ROLES_EDITOR);
- itemPropertyDescriptors.add(propertyDescriptor);
- // This is for the secConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
- WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
- pkg.getAuthConstraint_SecConstraint()));
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthConstraint_description_feature"), getString( //$NON-NLS-1$
- "_UI_PropertyDescriptor_description", "_UI_AuthConstraint_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_AuthConstraint_type"), WebapplicationPackage.eINSTANCE.getAuthConstraint_Description(), true, //$NON-NLS-1$
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Roles feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRolesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthConstraint_roles_feature"), getString( //$NON-NLS-1$
- "_UI_PropertyDescriptor_description", "_UI_AuthConstraint_roles_feature", "_UI_AuthConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getAuthConstraint_Roles(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions());
- }
- return childrenReferences;
- }
-
- public String getText(Object object) {
- String description = ((AuthConstraint) object).getDescription();
- if (description == null) {
- List descList = ((AuthConstraint) object).getDescriptions();
- if (descList != null && descList.size() > 0)
- description = ((Description) descList.get(0)).getValue();
- }
- if (description == null)
- description = ""; //$NON-NLS-1$
- // return WebAppEditResourceHandler.getString("11concat_UI_", (new
- // Object[]{description})); //$NON-NLS-1$ = "AuthConstraint {0}"
- return description;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(AuthConstraint.class)) {
- case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION :
- case WebapplicationPackage.AUTH_CONSTRAINT__ROLES :
- case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.IEditingDomainItemProvider#createCommand(java.lang.Object,
- * org.eclipse.emf.edit.domain.EditingDomain, java.lang.Class,
- * org.eclipse.emf.edit.command.CommandParameter)
- */
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- EStructuralFeature sf = commandParameter.getEReference();
- if (sf == null) {
- sf = commandParameter.getEAttribute();
- if (sf != null && !sf.isMany())
- sf = null;
- }
- if (sf != null) {
- EObject owner = commandParameter.getEOwner();
- Collection collection = commandParameter.getCollection();
- if (commandClass == AddCommand.class) {
- return createAddCommand(editingDomain, owner, sf, collection, commandParameter.getIndex());
- } else if (commandClass == RemoveCommand.class) {
- return createRemoveCommand(editingDomain, owner, sf, collection);
- }
- }
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
deleted file mode 100644
index e110ef8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
+++ /dev/null
@@ -1,190 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}
- * object.
- */
-public class ContextParamItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ContextParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns initializ_parameter_context.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("initializ_parameter_context");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the ContextParam.
- */
- public Object getParent(Object object) {
- return ((ContextParam) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the paramName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamName_UI_"), //$NON-NLS-1$ = "ParamName"
- WebAppEditResourceHandler.getString("The_paramName_property_UI_"), //$NON-NLS-1$ = "The paramName property"
- pkg.getContextParam_ParamName()));
-
- // This is for the paramValue feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamValue_UI_"), //$NON-NLS-1$ = "ParamValue"
- WebAppEditResourceHandler.getString("The_paramValue_property_UI_"), //$NON-NLS-1$ = "The paramValue property"
- pkg.getContextParam_ParamValue()));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getContextParam_Description()));
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getContextParam_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_paramName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_paramName_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getContextParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_paramValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_paramValue_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getContextParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_description_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getContextParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("12concat_UI_", (new Object[]{((ContextParam) object).getParamName()})); //$NON-NLS-1$ = "ContextParam {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ContextParam.class)) {
- case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME :
- case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE :
- case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java
deleted file mode 100644
index 0bc3551..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java
+++ /dev/null
@@ -1,124 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}
- * object.
- */
-public class ErrorCodeErrorPageItemProvider extends ErrorPageItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ErrorCodeErrorPageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns errorcode_errorpage.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("errorcode_errorpage"); //$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the errorCode feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ErrorCode_UI_"), //$NON-NLS-1$ = "ErrorCode"
- WebAppEditResourceHandler.getString("The_errorCode_property_UI_"), //$NON-NLS-1$ = "The errorCode property"
- pkg.getErrorCodeErrorPage_ErrorCode()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Error Code feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addErrorCodePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ErrorCodeErrorPage_errorCode_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ErrorCodeErrorPage_errorCode_feature", "_UI_ErrorCodeErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getErrorCodeErrorPage_ErrorCode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("14concat_UI_", (new Object[]{((ErrorCodeErrorPage) object).getErrorCode()})); //$NON-NLS-1$ = "ErrorCodeErrorPage {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ErrorCodeErrorPage.class)) {
- case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
deleted file mode 100644
index 190fa5f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
+++ /dev/null
@@ -1,140 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}object.
- */
-public class ErrorPageItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ErrorPageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns error_page.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("error_page"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the ErrorPage.
- */
- public Object getParent(Object object) {
- return ((ErrorPage) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the location feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$ = "Location"
- WebAppEditResourceHandler.getString("The_location_property_UI_"), //$NON-NLS-1$ = "The location property"
- pkg.getErrorPage_Location()));
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Location feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ErrorPage_location_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ErrorPage_location_feature", "_UI_ErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getErrorPage_Location(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("13concat_UI_", (new Object[]{((ErrorPage) object).getLocation()})); //$NON-NLS-1$ = "ErrorPage {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ErrorPage.class)) {
- case WebapplicationPackage.ERROR_PAGE__LOCATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
deleted file mode 100644
index 2b4befc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
+++ /dev/null
@@ -1,118 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}object.
- */
-public class ExceptionTypeErrorPageItemProvider extends ErrorPageItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ExceptionTypeErrorPageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns exception_type_errorpage.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("exception_type_errorpage"); //$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the exceptionType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ExceptionType_UI_"), //$NON-NLS-1$ = "ExceptionType"
- WebAppEditResourceHandler.getString("The_exceptionType_property_UI_"), //$NON-NLS-1$ = "The exceptionType property"
- pkg.getExceptionTypeErrorPage_ExceptionType()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Exception Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addExceptionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionTypeErrorPage_exceptionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionTypeErrorPage_exceptionType_feature", "_UI_ExceptionTypeErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getExceptionTypeErrorPage_ExceptionType(), true));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("15concat_UI_", (new Object[]{((ExceptionTypeErrorPage) object).getExceptionTypeName()})); //$NON-NLS-1$ = "ExceptionTypeErrorPage {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
deleted file mode 100644
index 89c494d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
+++ /dev/null
@@ -1,263 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class FilterItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public FilterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- InitParam child = WebapplicationFactory.eINSTANCE.createInitParam();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- WebApp webApp = (WebApp) ((Filter) object).eContainer();
- if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- result.add(pkg.getFilter_InitParamValues());
- else
- result.add(pkg.getFilter_InitParams());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateInitParam"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return "Create InitParam"; //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("26concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type InitParam for the selected {0}."
- }
-
- /**
- * This returns Filter.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the Filter.
- */
- public Object getParent(Object object) {
- return WebapplicationPackage.eINSTANCE.getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- WebapplicationPackage wap = WebapplicationPackage.eINSTANCE;
-
- // This is for the filterName feature.
-
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FilterItemProvider_UI_0"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("The_filterName_property_3"), wap.getFilter_Name())); //$NON-NLS-1$ //$NON-NLS-2$
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Filter_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilter_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Filter Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFilterClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Filter_filterClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Filter_filterClass_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilter_FilterClass(), true));
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public Object getPropertyValue(Object object, String property) {
- Object ret = null;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
- } else
- ret = super.getPropertyValue(object, property);
- return ret;
- }
-
- public String getText(Object object) {
- Filter filter = (Filter) object;
- String name = filter.getName();
- if (name == null)
- name = "<filter>"; //$NON-NLS-1$
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Filter.class)) {
- case WebapplicationPackage.FILTER__NAME :
- case WebapplicationPackage.FILTER__INIT_PARAMS :
- case WebapplicationPackage.FILTER__INIT_PARAM_VALUES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getFilter_InitParams(), WebapplicationFactory.eINSTANCE.createInitParam()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getFilter_InitParamValues(), CommonFactory.eINSTANCE.createParamValue()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
- * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public boolean isPropertySet(Object object, String property) {
- boolean ret = false;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
- } else
- ret = super.isPropertySet(object, property);
- return ret;
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public void setPropertyValue(Object object, String property, Object value) {
-
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
- } else
- super.setPropertyValue(object, property, value);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
deleted file mode 100644
index a46c2f8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
+++ /dev/null
@@ -1,196 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}
- * object.
- */
-public class FilterMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public FilterMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns filter_mapping.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter_mapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the FilterMapping.
- */
- public Object getParent(Object object) {
- return WebapplicationPackage.eINSTANCE.getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- WebapplicationPackage wap = WebapplicationPackage.eINSTANCE;
-
- // This is for the urlPattern feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
- WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
- wap.getFilterMapping_UrlPattern()));
-
- // This is for the filter feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Filter", WebAppEditResourceHandler.getString("The_filter_property_2"), wap.getFilterMapping_Filter(), false)); //$NON-NLS-1$ //$NON-NLS-2$
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_urlPattern_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Dispatcher Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDispatcherTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_dispatcherType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_dispatcherType_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_DispatcherType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Filter feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFilterPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_filter_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_filter_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_Filter(), true));
- }
-
- /**
- * This adds a property descriptor for the Servlet feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_servlet_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_servlet_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_Servlet(), true));
- }
-
-
- public String getText(Object object) {
- FilterMapping filterMapping = (FilterMapping) object;
- Filter filter = filterMapping.getFilter();
- String filterStr = (filter == null) ? WebAppEditResourceHandler.getString("?_UI_") : filter.getName(); //$NON-NLS-1$ = "?"
-
- String mapText = ((FilterMapping) object).getUrlPattern();
- if (mapText == null) {
- Servlet servlet = filterMapping.getServlet();
- if (servlet != null)
- mapText = servlet.getServletName();
- }
- if (mapText == null)
- mapText = "?"; //$NON-NLS-1$
- return WebAppEditResourceHandler.getString("Filter_mapping_text", new Object[]{filterStr, mapText}); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(FilterMapping.class)) {
- case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN :
- case WebapplicationPackage.FILTER_MAPPING__FILTER :
- case WebapplicationPackage.FILTER_MAPPING__SERVLET :
- case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
deleted file mode 100644
index f9fe867..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
+++ /dev/null
@@ -1,178 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}
- * object.
- */
-public class FormLoginConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public FormLoginConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns form_login_config.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("form_login_config");//$NON-NLS-1$
- }
-
- /**
- * This returns form_login_config.gif.
- */
- //TODO Removing the UI dependency by commenting out this method
- /*
- * public Image getLabelImage(Object object) { return (Image)
- * WEBUIPlugin.getDefault().getImageFromRegistry("form_login_config");//$NON-NLS-1$ }
- */
- public String getLabelText(Object object) {
- return WebAppEditResourceHandler.getString("52concat_UI_", (new Object[]{((FormLoginConfig) object).getFormLoginPage()})); //$NON-NLS-1$ = "FormLoginConfig {0}"
- }
-
- /**
- * This returns the loginConfig of the FormLoginConfig.
- */
- public Object getParent(Object object) {
- return ((FormLoginConfig) object).getLoginConfig();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the formLoginPage feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormLoginPage_UI_"), //$NON-NLS-1$ = "FormLoginPage"
- WebAppEditResourceHandler.getString("The_formLoginPage_property_UI_"), //$NON-NLS-1$ = "The formLoginPage property"
- pkg.getFormLoginConfig_FormLoginPage()));
-
- // This is for the formErrorPage feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormErrorPage_UI_"), //$NON-NLS-1$ = "FormErrorPage"
- WebAppEditResourceHandler.getString("The_formErrorPage_property_UI_"), //$NON-NLS-1$ = "The formErrorPage property"
- pkg.getFormLoginConfig_FormErrorPage()));
-
- // This is for the loginConfig feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("LoginConfig_UI_"), //$NON-NLS-1$ = "LoginConfig"
- WebAppEditResourceHandler.getString("The_loginConfig_property_UI_"), //$NON-NLS-1$ = "The loginConfig property"
- pkg.getFormLoginConfig_LoginConfig()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Form Login Page feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFormLoginPagePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FormLoginConfig_formLoginPage_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FormLoginConfig_formLoginPage_feature", "_UI_FormLoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFormLoginConfig_FormLoginPage(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Form Error Page feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFormErrorPagePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FormLoginConfig_formErrorPage_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FormLoginConfig_formErrorPage_feature", "_UI_FormLoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFormLoginConfig_FormErrorPage(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("16concat_UI_", (new Object[]{((FormLoginConfig) object).getFormLoginPage()})); //$NON-NLS-1$ = "FormLoginConfig {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(FormLoginConfig.class)) {
- case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE :
- case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
deleted file mode 100644
index 1828e70..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
+++ /dev/null
@@ -1,149 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}
- * object.
- */
-public class HTTPMethodTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public HTTPMethodTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns http_type.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("http_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the resCollection of the HTTPMethodType.
- */
- public Object getParent(Object object) {
- return ((HTTPMethodType) object).getHttpMethod();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the httpMethod feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("HttpMethod_UI_"), //$NON-NLS-1$ = "HttpMethod"
- WebAppEditResourceHandler.getString("The_httpMethod_property_UI_"), //$NON-NLS-1$ = "The httpMethod property"
- pkg.getHTTPMethodType_HttpMethod()));
-
- // This is for the resCollection feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ResCollection_UI_"), //$NON-NLS-1$ = "ResCollection"
- WebAppEditResourceHandler.getString("The_resCollection_property_UI_"), //$NON-NLS-1$ = "The resCollection property"
- pkg.getHTTPMethodType_HttpMethod()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Http Method feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHttpMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_HTTPMethodType_httpMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_HTTPMethodType_httpMethod_feature", "_UI_HTTPMethodType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getHTTPMethodType_HttpMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("17concat_UI_", (new Object[]{((HTTPMethodType) object).getHttpMethod()})); //$NON-NLS-1$ = "HTTPMethodType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(HTTPMethodType.class)) {
- case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
deleted file mode 100644
index 0a0a6d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
+++ /dev/null
@@ -1,223 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}object.
- */
-public class InitParamItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public InitParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns initializ_parameter.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("initializ_parameter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the servlet of the InitParam.
- */
- public Object getParent(Object object) {
- return ((InitParam) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the paramName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamName_UI_"), //$NON-NLS-1$ = "ParamName"
- WebAppEditResourceHandler.getString("The_paramName_property_UI_"), //$NON-NLS-1$ = "The paramName property"
- pkg.getInitParam_ParamName()));
-
- // This is for the paramValue feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamValue_UI_"), //$NON-NLS-1$ = "ParamValue"
- WebAppEditResourceHandler.getString("The_paramValue_property_UI_"), //$NON-NLS-1$ = "The paramValue property"
- pkg.getInitParam_ParamValue()));
-
- // This is for the description feature.
- //
- WebToolingItemPropertyDescriptor propertyDescriptor = new WebToolingItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- pkg.getInitParam_Description(), WebToolingItemPropertyDescriptor.MULTILINE_TEXT_EDITOR);
- itemPropertyDescriptors.add(propertyDescriptor);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_paramName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_InitParam_paramName_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getInitParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_paramValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_InitParam_paramValue_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getInitParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_InitParam_description_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getInitParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This implements
- * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public Object getPropertyValue(Object object, String property) {
- Object ret = null;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
- } else
- ret = super.getPropertyValue(object, property);
- return ret;
- }
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("18concat_UI_", (new Object[]{((InitParam) object).getParamName(), ((InitParam) object).getParamValue()})); //$NON-NLS-1$ = "{0} = {1}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(InitParam.class)) {
- case WebapplicationPackage.INIT_PARAM__PARAM_NAME :
- case WebapplicationPackage.INIT_PARAM__PARAM_VALUE :
- case WebapplicationPackage.INIT_PARAM__DESCRIPTION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
- /**
- * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
- * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public boolean isPropertySet(Object object, String property) {
- boolean ret = false;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
- } else
- ret = super.isPropertySet(object, property);
- return ret;
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public void setPropertyValue(Object object, String property, Object value) {
-
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
- } else
- super.setPropertyValue(object, property, value);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.java
deleted file mode 100644
index 19a4b49..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * Insert the type's description here. Creation date: (6/18/2001 5:53:02 PM)
- *
- * @author: Administrator
- */
-public class ItemHolder extends ItemProvider {
- protected WebApp webApp;
- protected WebArtifactEdit webArtifactEdit;
-
- public ItemHolder() {
- super();
- }
-
- /**
- * Jarholder constructor comment.
- */
- public ItemHolder(WebApp webApp) {
- super();
- setWebApp(webApp);
- }
- public ItemHolder(WebArtifactEdit webArtifactEdit) {
- super();
- setWebArtifactEdit(webArtifactEdit);
- }
-
- public Collection getChildren(Object element) {
- WebApp testElement;
- Vector v = new Vector();
- if (element instanceof ItemHolder) {
- testElement = ((ItemHolder) element).getWebApp();
- v.add(testElement);
- }
- return v;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/18/2001 6:00:43 PM)
- *
- * @return org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar
- */
- public WebApp getWebApp() {
- return webApp;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/18/2001 6:00:43 PM)
- *
- * @param newJar
- * org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar
- */
- public void setWebApp(WebApp aWebApp) {
- webApp = aWebApp;
- }
-
- public WebArtifactEdit getWebArtifactEdit() {
- return webArtifactEdit;
- }
-
- public void setWebArtifactEdit(WebArtifactEdit webArtifactEdit) {
- this.webArtifactEdit = webArtifactEdit;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
deleted file mode 100644
index 1a59fa8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
+++ /dev/null
@@ -1,154 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.JSPConfig}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class JSPConfigItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JSPConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JspPackage.eINSTANCE.getJSPConfig_TagLibs());
- childrenReferences.add(JspPackage.eINSTANCE.getJSPConfig_PropertyGroups());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns JSPConfig.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("full/obj16/JSPConfig"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("_UI_JSPConfig_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JSPConfig.class)) {
- case JspPackage.JSP_CONFIG__TAG_LIBS :
- case JspPackage.JSP_CONFIG__PROPERTY_GROUPS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JspPackage.eINSTANCE.getJSPConfig_TagLibs(), JspFactory.eINSTANCE.createTagLibRefType()));
-
- newChildDescriptors.add(createChildParameter(JspPackage.eINSTANCE.getJSPConfig_PropertyGroups(), JspFactory.eINSTANCE.createJSPPropertyGroup()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java
deleted file mode 100644
index d05194d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java
+++ /dev/null
@@ -1,218 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.JSPPropertyGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class JSPPropertyGroupItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JSPPropertyGroupItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addUrlPatternPropertyDescriptor(object);
- addElIgnoredPropertyDescriptor(object);
- addPageEncodingPropertyDescriptor(object);
- addScriptingInvalidPropertyDescriptor(object);
- addIsXMLPropertyDescriptor(object);
- addIncludePreludesPropertyDescriptor(object);
- addIncludeCodasPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_urlPattern_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the El Ignored feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addElIgnoredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_elIgnored_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_elIgnored_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_ElIgnored(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Page Encoding feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPageEncodingPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_pageEncoding_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_pageEncoding_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_PageEncoding(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Scripting Invalid feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addScriptingInvalidPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_scriptingInvalid_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_scriptingInvalid_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_ScriptingInvalid(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Is XML feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addIsXMLPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_isXML_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_isXML_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_IsXML(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Include Preludes feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addIncludePreludesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_includePreludes_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_includePreludes_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_IncludePreludes(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Include Codas feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addIncludeCodasPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_includeCodas_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_includeCodas_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_IncludeCodas(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns JSPPropertyGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("full/obj16/JSPPropertyGroup"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((JSPPropertyGroup) object).getDisplayName();
- return label == null || label.length() == 0 ? getString("_UI_JSPPropertyGroup_type") : //$NON-NLS-1$
- getString("_UI_JSPPropertyGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JSPPropertyGroup.class)) {
- case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN :
- case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED :
- case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING :
- case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID :
- case JspPackage.JSP_PROPERTY_GROUP__IS_XML :
- case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES :
- case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- // return J2EEPlugin.getDefault();
- return WebAppEditResourceHandler.RESOURCE_LOCATOR;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java
deleted file mode 100644
index 9f7ac5b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java
+++ /dev/null
@@ -1,123 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}object.
- */
-public class JSPTypeItemProvider extends WebTypeItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public JSPTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns jsp_type.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("jsp_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the jspFile feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("JspFile_UI_"), //$NON-NLS-1$ = "JspFile"
- WebAppEditResourceHandler.getString("The_jspFile_property_UI_"), //$NON-NLS-1$ = "The jspFile property"
- pkg.getJSPType_JspFile()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Jsp File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addJspFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPType_jspFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPType_jspFile_feature", "_UI_JSPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getJSPType_JspFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("40concat_UI_", (new Object[]{((JSPType) object).getJspFile()})); //$NON-NLS-1$ = "JSPType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JSPType.class)) {
- case WebapplicationPackage.JSP_TYPE__JSP_FILE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
deleted file mode 100644
index 9682d72..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,232 +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.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.jsp.internal.util.JspAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class JspItemProviderAdapterFactory extends JspAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public JspItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.JSPConfig}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JSPConfigItemProvider jspConfigItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jsp.JSPConfig}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createJSPConfigAdapter() {
- if (jspConfigItemProvider == null) {
- jspConfigItemProvider = new JSPConfigItemProvider(this);
- }
-
- return jspConfigItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.JSPPropertyGroup}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JSPPropertyGroupItemProvider jspPropertyGroupItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jsp.JSPPropertyGroup}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createJSPPropertyGroupAdapter() {
- if (jspPropertyGroupItemProvider == null) {
- jspPropertyGroupItemProvider = new JSPPropertyGroupItemProvider(this);
- }
-
- return jspPropertyGroupItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.TagLibRefType}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected TagLibRefTypeItemProvider tagLibRefTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jsp.TagLibRefType}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createTagLibRefTypeAdapter() {
- if (tagLibRefTypeItemProvider == null) {
- tagLibRefTypeItemProvider = new TagLibRefTypeItemProvider(this);
- }
-
- return tagLibRefTypeItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
deleted file mode 100644
index 2f23448..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
+++ /dev/null
@@ -1,148 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class LocalEncodingMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public LocalEncodingMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addLocalePropertyDescriptor(object);
- addEncodingPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Locale feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLocalePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LocalEncodingMapping_locale_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LocalEncodingMapping_locale_feature", "_UI_LocalEncodingMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLocalEncodingMapping_Locale(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Encoding feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEncodingPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LocalEncodingMapping_encoding_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LocalEncodingMapping_encoding_feature", "_UI_LocalEncodingMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLocalEncodingMapping_Encoding(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns LocalEncodingMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- // return getResourceLocator().getImage("full/obj16/LocalEncodingMapping");
- return WebPlugin.getDefault().getImage("local_encoding_mapping");//$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- */
- public String getText(Object object) {
- String lem = WebAppEditResourceHandler.getString("local_encoding_mapping_UI_"); //$NON-NLS-1$
- String label = ((LocalEncodingMapping) object).getLocale();
- return label == null || label.length() == 0 ? lem : lem + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(LocalEncodingMapping.class)) {
- case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE :
- case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
deleted file mode 100644
index 986dc41..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
+++ /dev/null
@@ -1,136 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class LocalEncodingMappingListItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public LocalEncodingMappingListItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getLocalEncodingMappingList_LocalEncodingMappings());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns LocalEncodingMappingList.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- // return getResourceLocator().getImage("full/obj16/LocalEncodingMappingList");
- return WebPlugin.getDefault().getImage("local_encoding_mapping_list");//$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- */
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Local_encoding_mapping_list_UI_"); //$NON-NLS-1$ = "Welcome File List"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(LocalEncodingMappingList.class)) {
- case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getLocalEncodingMappingList_LocalEncodingMappings(), WebapplicationFactory.eINSTANCE.createLocalEncodingMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
deleted file mode 100644
index 19bf93a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
+++ /dev/null
@@ -1,224 +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.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}object.
- */
-public class LoginConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public LoginConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: create some child object.
- return null;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getLoginConfig_FormLoginConfig());
- return result;
- }
-
- //TODO Removing UI dependency by commenting out method
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- /*
- * public ImageDescriptor getCreateChildImageDescriptor(Object object) { EObject refObject =
- * (EObject)object; return
- * WEBUIPlugin.getDefault().getImageDescriptor(refObject.eClass().getName() +
- * "Create#CHILD_CLASS_NAME#");//$NON-NLS-1$ }
- */
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_#CHILD_CLASS_NAME#_UI_"); //$NON-NLS-1$ = "Create #CHILD_CLASS_NAME#"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("1concat", (new Object[]{refObject.eClass().getName()}));//$NON-NLS-1$ = "Create a child of type #CHILD_CLASS_NAME# for the selected {0}."
- }
-
- /**
- * This returns form_login_config.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("form_login_config");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the LoginConfig.
- */
- public Object getParent(Object object) {
- return ((LoginConfig) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the authMethod feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("AuthMethod_UI_"), //$NON-NLS-1$ = "AuthMethod"
- WebAppEditResourceHandler.getString("The_authMethod_property_UI_"), //$NON-NLS-1$ = "The authMethod property"
- pkg.getLoginConfig_AuthMethod()));
-
- // This is for the realmName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("RealmName_UI_"), //$NON-NLS-1$ = "RealmName"
- WebAppEditResourceHandler.getString("The_realmName_property_UI_"), //$NON-NLS-1$ = "The realmName property"
- pkg.getLoginConfig_RealmName()));
-
- // This is for the webApp feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The webApp property"
- pkg.getLoginConfig_WebApp()));
-
- // This is for the formLoginConfig feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormLoginConfig_UI_"), //$NON-NLS-1$ = "FormLoginConfig"
- WebAppEditResourceHandler.getString("The_formLoginConfig_proper_UI_"), //$NON-NLS-1$ = "The formLoginConfig property"
- pkg.getLoginConfig_FormLoginConfig()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Auth Method feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addAuthMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_authMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_authMethod_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLoginConfig_AuthMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Realm Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRealmNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_realmName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_realmName_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLoginConfig_RealmName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Authorization Method feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAuthorizationMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_authorizationMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_authorizationMethod_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLoginConfig_AuthorizationMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("21concat_UI_", (new Object[]{((LoginConfig) object).getRealmName()})); //$NON-NLS-1$ = "LoginConfig {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(LoginConfig.class)) {
- case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD :
- case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME :
- case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD :
- case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getLoginConfig_FormLoginConfig(), WebapplicationFactory.eINSTANCE.createFormLoginConfig()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
deleted file mode 100644
index 6c086d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
+++ /dev/null
@@ -1,171 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}object.
- */
-public class MimeMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public MimeMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns mime_mapping.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("mime_mapping");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the MimeMapping.
- */
- public Object getParent(Object object) {
- return ((MimeMapping) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the extension feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Extension_UI_"), //$NON-NLS-1$ = "Extension"
- WebAppEditResourceHandler.getString("The_extension_property_UI_"), //$NON-NLS-1$ = "The extension property"
- pkg.getMimeMapping_Extension()));
-
- // This is for the mimeType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("MimeType_UI_"), //$NON-NLS-1$ = "MimeType"
- WebAppEditResourceHandler.getString("The_mimeType_property_UI_"), //$NON-NLS-1$ = "The mimeType property"
- pkg.getMimeMapping_MimeType()));
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getMimeMapping_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Extension feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addExtensionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MimeMapping_extension_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MimeMapping_extension_feature", "_UI_MimeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getMimeMapping_Extension(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Mime Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addMimeTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MimeMapping_mimeType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MimeMapping_mimeType_feature", "_UI_MimeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getMimeMapping_MimeType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("22concat_UI_", (new Object[]{((MimeMapping) object).getExtension()})); //$NON-NLS-1$ = "MimeMapping {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MimeMapping.class)) {
- case WebapplicationPackage.MIME_MAPPING__EXTENSION :
- case WebapplicationPackage.MIME_MAPPING__MIME_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
deleted file mode 100644
index c91f022..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
+++ /dev/null
@@ -1,136 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}
- * object.
- */
-public class RoleNameTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public RoleNameTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns security_role_nametype.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("security_role_nametype");//$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the roleName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("RoleName_UI_"), //$NON-NLS-1$ = "RoleName"
- WebAppEditResourceHandler.getString("The_roleName_property_UI_"), //$NON-NLS-1$ = "The roleName property"
- pkg.getRoleNameType_RoleName()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRoleNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RoleNameType_roleName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RoleNameType_roleName_feature", "_UI_RoleNameType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getRoleNameType_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("23concat_UI_", (new Object[]{((RoleNameType) object).getRoleName()})); //$NON-NLS-1$ = "RoleNameType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(RoleNameType.class)) {
- case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
deleted file mode 100644
index 30134bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
+++ /dev/null
@@ -1,242 +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.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}
- * object.
- */
-public class SecurityConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SecurityConstraintItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- WebResourceCollection child = WebapplicationFactory.eINSTANCE.createWebResourceCollection();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getSecurityConstraint_WebResourceCollections());
- result.add(pkg.getSecurityConstraint_AuthConstraint());
- result.add(pkg.getSecurityConstraint_UserDataConstraint());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateWebResourceCollection"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_WebResourceCollecti_UI_"); //$NON-NLS-1$ = "Create WebResourceCollection"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("24concat", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type WebResourceCollection for the selected {0}."
- }
-
- /**
- * This returns security_constraint.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("security_constraint"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the SecurityConstraint.
- */
- public Object getParent(Object object) {
- return ((SecurityConstraint) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getSecurityConstraint_WebApp()));
- */
-
- // This is for the displayName feature.
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("DisplayName_UI_"), //$NON-NLS-1$ = "DisplayName"
- WebAppEditResourceHandler.getString("The_displayName_property_UI_"), //$NON-NLS-1$ = "The displayName property"
- pkg.getSecurityConstraint_DisplayName()));
-
- // This is for the authConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("AuthConstraint_UI_"), //$NON-NLS-1$ = "AuthConstraint"
- WebAppEditResourceHandler.getString("The_authConstraint_propert_UI_"), //$NON-NLS-1$ = "The authConstraint property"
- pkg.getSecurityConstraint_AuthConstraint()));
-
- // This is for the userDataConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UserDataConstraint_UI_"), //$NON-NLS-1$ = "UserDataConstraint"
- WebAppEditResourceHandler.getString("The_userDataConstraint_pro_UI_"), //$NON-NLS-1$ = "The userDataConstraint property"
- pkg.getSecurityConstraint_UserDataConstraint()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDisplayNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityConstraint_displayName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityConstraint_displayName_feature", "_UI_SecurityConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- String displayName = ((SecurityConstraint) object).getDisplayName();
- if (displayName == null) {
- List displayNameList = ((SecurityConstraint) object).getDisplayNames();
- if (displayNameList != null && displayNameList.size() > 0)
- displayName = ((DisplayName) displayNameList.get(0)).getValue();
- }
- if (displayName == null)
- displayName = ""; //$NON-NLS-1$
- return " " + displayName; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SecurityConstraint.class)) {
- case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME :
- case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS :
- case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT :
- case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT :
- case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_WebResourceCollections(), WebapplicationFactory.eINSTANCE.createWebResourceCollection()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_AuthConstraint(), WebapplicationFactory.eINSTANCE.createAuthConstraint()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_UserDataConstraint(), WebapplicationFactory.eINSTANCE.createUserDataConstraint()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayNames(), CommonFactory.eINSTANCE.createDisplayName()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayNames(), WscommonFactory.eINSTANCE.createDisplayNameType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
deleted file mode 100644
index 5e84866..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
+++ /dev/null
@@ -1,297 +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.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class ServletItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ServletItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- InitParam child = WebapplicationFactory.eINSTANCE.createInitParam();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- //result.add(pkg.getServlet_WebType());
- WebApp webApp = (WebApp) ((Servlet) object).eContainer();
- if (webApp == null)
- return result;
- if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- result.add(pkg.getServlet_InitParams());
- else
- result.add(pkg.getServlet_Params());
- result.add(pkg.getServlet_SecurityRoleRefs());
- result.add(pkg.getServlet_RunAs());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateInitParam"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_InitParam_UI_"); //$NON-NLS-1$ = "Create InitParam"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("26concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type InitParam for the selected {0}."
- }
-
- /**
- * This returns Servlet.gif.
- */
- public Object getImage(Object object) {
- WebType wt = ((Servlet) object).getWebType();
- if (wt != null && wt.isJspType())
- return WebPlugin.getDefault().getImage("jsp_type"); //$NON-NLS-1$
-
- return WebPlugin.getDefault().getImage("servlet"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the Servlet.
- */
- public Object getParent(Object object) {
- return ((Servlet) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the servletName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ServletName_UI_"), //$NON-NLS-1$
- //$NON-NLS-1$ = "ServletName"
- WebAppEditResourceHandler.getString("The_servletName_property_UI_"), //$NON-NLS-1$ = "The servletName property"
- pkg.getServlet_ServletName()));
-
-
- // This is for the loadOnStartup feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("LoadOnStartup_UI_"), //$NON-NLS-1$
- //$NON-NLS-1$ = "LoadOnStartup"
- WebAppEditResourceHandler.getString("The_loadOnStartup_property_UI_"), //$NON-NLS-1$ = "The loadOnStartup property"
- pkg.getServlet_LoadOnStartup(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Servlet Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Servlet_servletName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Servlet_servletName_feature", "_UI_Servlet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServlet_ServletName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Load On Startup feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLoadOnStartupPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Servlet_loadOnStartup_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Servlet_loadOnStartup_feature", "_UI_Servlet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServlet_LoadOnStartup(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public Object getPropertyValue(Object object, String property) {
- Object ret = null;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
- } else
- ret = super.getPropertyValue(object, property);
- return ret;
- }
-
- public String getText(Object object) {
- Servlet servlet = (Servlet) object;
- String name = servlet.getServletName();
- if (name == null)
- name = WebAppEditResourceHandler.getString("<servlet>_UI_"); //$NON-NLS-1$ = "<servlet>"
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Servlet.class)) {
- case WebapplicationPackage.SERVLET__SERVLET_NAME :
- case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP :
- case WebapplicationPackage.SERVLET__WEB_TYPE :
- case WebapplicationPackage.SERVLET__PARAMS :
- case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS :
- case WebapplicationPackage.SERVLET__RUN_AS :
- case WebapplicationPackage.SERVLET__INIT_PARAMS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_WebType(), WebapplicationFactory.eINSTANCE.createServletType()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_WebType(), WebapplicationFactory.eINSTANCE.createJSPType()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_Params(), WebapplicationFactory.eINSTANCE.createInitParam()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_SecurityRoleRefs(), CommonFactory.eINSTANCE.createSecurityRoleRef()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_RunAs(), CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_InitParams(), CommonFactory.eINSTANCE.createParamValue()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
- * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public boolean isPropertySet(Object object, String property) {
- boolean ret = false;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
- } else
- ret = super.isPropertySet(object, property);
- return ret;
- }
-
-
- /**
- * This implements
- * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- public void setPropertyValue(Object object, String property, Object value) {
-
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
- } else
- super.setPropertyValue(object, property, value);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
deleted file mode 100644
index 602a2da..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
+++ /dev/null
@@ -1,177 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}
- * object.
- */
-public class ServletMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ServletMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns servlet_mapping.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet_mapping");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the ServletMapping.
- */
- public Object getParent(Object object) {
- return ((ServletMapping) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the urlPattern feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
- WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
- pkg.getServletMapping_UrlPattern()));
-
-
- // This is for the servlet feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Servlet_UI_"), //$NON-NLS-1$ = "Servlet"
- WebAppEditResourceHandler.getString("The_servlet_property_UI_"), //$NON-NLS-1$ = "The servlet property"
- pkg.getServletMapping_Servlet(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_urlPattern_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletMapping_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_name_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletMapping_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Servlet feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_servlet_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_servlet_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletMapping_Servlet(), false));
- }
-
-
- public String getText(Object object) {
- String urlStr = ((ServletMapping) object).getUrlPattern();
- Servlet servlet = ((ServletMapping) object).getServlet();
- String servletStr = (servlet == null) ? WebAppEditResourceHandler.getString("?_UI_") : servlet.getServletName(); //$NON-NLS-1$ = "?"
- return WebAppEditResourceHandler.getString("28concat_UI_", (new Object[]{urlStr, servletStr})); //$NON-NLS-1$ = "Servlet mapping ({0} -> {1})"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServletMapping.class)) {
- case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN :
- case WebapplicationPackage.SERVLET_MAPPING__NAME :
- case WebapplicationPackage.SERVLET_MAPPING__SERVLET : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java
deleted file mode 100644
index 2039a89..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java
+++ /dev/null
@@ -1,123 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}object.
- */
-public class ServletTypeItemProvider extends WebTypeItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ServletTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns servlet_type.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet_type"); //$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the className feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ClassName_UI_"), //$NON-NLS-1$ = "ClassName"
- WebAppEditResourceHandler.getString("The_className_property_UI_"), //$NON-NLS-1$ = "The className property"
- pkg.getServletType_ClassName()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Class Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addClassNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletType_className_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletType_className_feature", "_UI_ServletType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletType_ClassName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("41concat_UI_", (new Object[]{((ServletType) object).getClassName()})); //$NON-NLS-1$ = "ServletType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServletType.class)) {
- case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
deleted file mode 100644
index e4c8b44..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
+++ /dev/null
@@ -1,148 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}
- * object.
- */
-public class SessionConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SessionConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns session_config.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("session_config");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the SessionConfig.
- */
- public Object getParent(Object object) {
- return ((SessionConfig) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the sessionTimeout feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SessionTimeout_UI_"), //$NON-NLS-1$ = "SessionTimeout"
- WebAppEditResourceHandler.getString("The_sessionTimeout_propert_UI_"), //$NON-NLS-1$ = "The sessionTimeout property"
- pkg.getSessionConfig_SessionTimeout()));
-
- // This is for the webApp feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The webApp property"
- pkg.getSessionConfig_WebApp()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Session Timeout feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSessionTimeoutPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SessionConfig_sessionTimeout_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SessionConfig_sessionTimeout_feature", "_UI_SessionConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getSessionConfig_SessionTimeout(), true, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("31concat_UI_", (new Object[]{new Integer(((SessionConfig) object).getSessionTimeout())})); //$NON-NLS-1$ = "SessionConfig {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SessionConfig.class)) {
- case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
deleted file mode 100644
index ff337fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
+++ /dev/null
@@ -1,170 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}object.
- */
-public class TagLibRefItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public TagLibRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns jsp_library_reference.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("jsp_library_reference");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the TagLibRef.
- */
- public Object getParent(Object object) {
- return ((TagLibRef) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the taglibURI feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$ = "TaglibURI"
- WebAppEditResourceHandler.getString("The_taglibURI_property_UI_"), //$NON-NLS-1$ = "The taglibURI property"
- pkg.getTagLibRef_TaglibURI()));
-
- // This is for the taglibLocation feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$ = "TaglibLocation"
- WebAppEditResourceHandler.getString("The_taglibLocation_propert_UI_"), //$NON-NLS-1$ = "The taglibLocation property"
- pkg.getTagLibRef_TaglibLocation()));
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getTagLibRef_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Taglib URI feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_TagLibRef_taglibURI_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TagLibRef_taglibURI_feature", "_UI_TagLibRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getTagLibRef_TaglibURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Taglib Location feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_TagLibRef_taglibLocation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TagLibRef_taglibLocation_feature", "_UI_TagLibRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getTagLibRef_TaglibLocation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("32concat_UI_", (new Object[]{((TagLibRef) object).getTaglibURI()})); //$NON-NLS-1$ = "TagLibRef {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(TagLibRef.class)) {
- case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI :
- case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java
deleted file mode 100644
index 9430cfc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java
+++ /dev/null
@@ -1,148 +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.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.TagLibRefType}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class TagLibRefTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public TagLibRefTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addTaglibURIPropertyDescriptor(object);
- addTaglibLocationPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Taglib URI feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$
- JspPackage.eINSTANCE.getTagLibRefType_TaglibURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Taglib Location feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$
- JspPackage.eINSTANCE.getTagLibRefType_TaglibLocation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns TagLibRefType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("full/obj16/TagLibRefType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((TagLibRefType) object).getTaglibURI();
- String tlrt = WebAppEditResourceHandler.getString("_UI_TagLibRefType_type"); //$NON-NLS-1$
- return label == null || label.length() == 0 ? tlrt : tlrt + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(TagLibRefType.class)) {
- case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI :
- case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
deleted file mode 100644
index 25339c3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
+++ /dev/null
@@ -1,148 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}
- * object.
- */
-public class URLPatternTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public URLPatternTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns url_type.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("url_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the resCollection of the URLPatternType.
- */
- public Object getParent(Object object) {
- return ((URLPatternType) object).getResCollection();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the urlPattern feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
- WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
- pkg.getURLPatternType_UrlPattern()));
-
- // This is for the resCollection feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ResCollection_UI_"), //$NON-NLS-1$ = "ResCollection"
- WebAppEditResourceHandler.getString("The_resCollection_property_UI_"), //$NON-NLS-1$ = "The resCollection property"
- pkg.getURLPatternType_ResCollection()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_URLPatternType_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_URLPatternType_urlPattern_feature", "_UI_URLPatternType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getURLPatternType_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("33concat_UI_", (new Object[]{((URLPatternType) object).getUrlPattern()})); //$NON-NLS-1$ = "URLPatternType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(URLPatternType.class)) {
- case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
deleted file mode 100644
index 02c04b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
+++ /dev/null
@@ -1,189 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}
- * object.
- */
-public class UserDataConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public UserDataConstraintItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns user_data_constraint.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("user_data_constraint"); //$NON-NLS-1$
- }
-
- /**
- * This returns the secConstraint of the UserDataConstraint.
- */
- public Object getParent(Object object) {
- return ((UserDataConstraint) object).getSecConstraint();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getUserDataConstraint_Description()));
-
- // This is for the transportGuarantee feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("TransportGuarantee_UI_"), //$NON-NLS-1$ = "TransportGuarantee"
- WebAppEditResourceHandler.getString("The_transportGuarantee_pro_UI_"), //$NON-NLS-1$ = "The transportGuarantee property"
- pkg.getUserDataConstraint_TransportGuarantee()));
-
- // This is for the secConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
- WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
- pkg.getUserDataConstraint_SecConstraint()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UserDataConstraint_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UserDataConstraint_description_feature", "_UI_UserDataConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getUserDataConstraint_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Transport Guarantee feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransportGuaranteePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UserDataConstraint_transportGuarantee_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UserDataConstraint_transportGuarantee_feature", "_UI_UserDataConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getUserDataConstraint_TransportGuarantee(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("34concat_UI_", (new Object[]{((UserDataConstraint) object).getTransportGuarantee().getName()})); //$NON-NLS-1$ = "UserDataConstraint {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(UserDataConstraint.class)) {
- case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION :
- case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE :
- case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java
deleted file mode 100644
index 8e82792..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java
+++ /dev/null
@@ -1,97 +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.jst.j2ee.internal.web.providers;
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-public class WebAppEditResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- public static ResourceLocator RESOURCE_LOCATOR = new ResourceLocator() {
- public URL getBaseURL() {
- return null;
- }
-
- public Object getImage(String arg0) {
- return WebPlugin.getDefault().getImage(arg0);
- }
-
- public String getString(String arg0) {
- return WebAppEditResourceHandler.getString(arg0);
- }
-
- public String getString(String arg0, Object[] arg1) {
- return WebAppEditResourceHandler.getString(arg0, arg1);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
- };
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("webedit");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
deleted file mode 100644
index 773db7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
+++ /dev/null
@@ -1,349 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.provider.JNDIEnvRefsGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}object.
- */
-public class WebAppItemProvider extends JNDIEnvRefsGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WebAppItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- ContextParam child = WebapplicationFactory.eINSTANCE.createContextParam();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- WebApp webApp = (WebApp) object;
- Collection myChildren = super.getChildren(object);
- if (webApp.getVersionID() <= J2EEVersionConstants.WEB_2_3_ID) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- myChildren.addAll(serviceHelper.get13ServiceRefs(webApp));
- }
- return myChildren;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
-
-
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Contexts());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_FileList());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_TagLibs());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Constraints());
- //childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_LoginConfig());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_MimeMappings());
- //childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_SessionConfig());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ServletMappings());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Servlets());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_SecurityRoles());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Filters());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_FilterMappings());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Listeners());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ContextParams());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_JspConfig());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_MessageDestinations());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_LocalEncodingMappingList());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateContextParam"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_ContextParam_UI_"); //$NON-NLS-1$ = "Create ContextParam"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("35concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type ContextParam for the selected {0}."
- }
-
- public Object getImage(Object object) {
- String key = null;
- if (((WebApp) object).eResource() == null)
- return J2EEPlugin.getPlugin().getImage("web_application"); //$NON-NLS-1$
- switch (((WebApp) object).getVersionID()) {
- case J2EEVersionConstants.WEB_2_2_ID :
- key = "webapp_22"; //$NON-NLS-1$
- break;
-
- case J2EEVersionConstants.WEB_2_3_ID :
- key = "webapp_23"; //$NON-NLS-1$
- break;
-
- case J2EEVersionConstants.WEB_2_4_ID :
- default :
- key = "webapp_24"; //$NON-NLS-1$
- break;
- }
- return WebPlugin.getDefault().getImage(key);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the distributable feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Distributable_UI_"), //$NON-NLS-1$
- //$NON-NLS-1$ = "Distributable"
- WebAppEditResourceHandler.getString("The_distributable_property_UI_"), //$NON-NLS-1$ = "The distributable property"
- pkg.getWebApp_Distributable()));
-
-
- // This is for the fileList feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FileList_UI_"), //$NON-NLS-1$ = "FileList"
- WebAppEditResourceHandler.getString("The_fileList_property_UI_"), //$NON-NLS-1$ = "The fileList property"
- pkg.getWebApp_FileList()));
-
- /*
- * // ccc - for usability reasons, these descriptors are removed from the property
- * sheet. // This is for the loginConfig feature. // itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "LoginConfig",
- * "The loginConfig property", pkg.getWebApp_LoginConfig()));
- * // This is for the sessionConfig feature. // itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * "SessionConfig", "The sessionConfig property", pkg.getWebApp_SessionConfig()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Distributable feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDistributablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebApp_distributable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebApp_distributable_feature", "_UI_WebApp_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebApp_Distributable(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebApp_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebApp_version_feature", "_UI_WebApp_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebApp_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- WebApp webApp = (WebApp) object;
- String name = webApp.getDisplayName();
- if (name == null)
- name = WebAppEditResourceHandler.getString("<web_app>_UI_"); //$NON-NLS-1$ = "<web app>"
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebApp.class)) {
- case WebapplicationPackage.WEB_APP__DISTRIBUTABLE :
- case WebapplicationPackage.WEB_APP__VERSION :
- case WebapplicationPackage.WEB_APP__CONTEXTS :
- case WebapplicationPackage.WEB_APP__ERROR_PAGES :
- case WebapplicationPackage.WEB_APP__FILE_LIST :
- case WebapplicationPackage.WEB_APP__TAG_LIBS :
- case WebapplicationPackage.WEB_APP__CONSTRAINTS :
- case WebapplicationPackage.WEB_APP__LOGIN_CONFIG :
- case WebapplicationPackage.WEB_APP__MIME_MAPPINGS :
- case WebapplicationPackage.WEB_APP__SESSION_CONFIG :
- case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS :
- case WebapplicationPackage.WEB_APP__SERVLETS :
- case WebapplicationPackage.WEB_APP__SECURITY_ROLES :
- case WebapplicationPackage.WEB_APP__FILTERS :
- case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS :
- case WebapplicationPackage.WEB_APP__LISTENERS :
- case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS :
- case WebapplicationPackage.WEB_APP__JSP_CONFIG :
- case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS :
- case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Contexts(), WebapplicationFactory.eINSTANCE.createContextParam()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createErrorPage()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createExceptionTypeErrorPage()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createErrorCodeErrorPage()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_FileList(), WebapplicationFactory.eINSTANCE.createWelcomeFileList()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_TagLibs(), WebapplicationFactory.eINSTANCE.createTagLibRef()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Constraints(), WebapplicationFactory.eINSTANCE.createSecurityConstraint()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_LoginConfig(), WebapplicationFactory.eINSTANCE.createLoginConfig()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_MimeMappings(), WebapplicationFactory.eINSTANCE.createMimeMapping()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_SessionConfig(), WebapplicationFactory.eINSTANCE.createSessionConfig()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ServletMappings(), WebapplicationFactory.eINSTANCE.createServletMapping()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Servlets(), WebapplicationFactory.eINSTANCE.createServlet()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_SecurityRoles(), CommonFactory.eINSTANCE.createSecurityRole()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Filters(), WebapplicationFactory.eINSTANCE.createFilter()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_FilterMappings(), WebapplicationFactory.eINSTANCE.createFilterMapping()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Listeners(), CommonFactory.eINSTANCE.createListener()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ContextParams(), CommonFactory.eINSTANCE.createParamValue()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_JspConfig(), JspFactory.eINSTANCE.createJSPConfig()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_MessageDestinations(), CommonFactory.eINSTANCE.createMessageDestination()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_LocalEncodingMappingList(), WebapplicationFactory.eINSTANCE.createLocalEncodingMappingList()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
deleted file mode 100644
index 4b294a6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
+++ /dev/null
@@ -1,294 +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.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}object.
- */
-public class WebResourceCollectionItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WebResourceCollectionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- URLPatternType child = WebapplicationFactory.eINSTANCE.createURLPatternType();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getWebResourceCollection_UrlPattern());
- result.add(pkg.getWebResourceCollection_HttpMethod());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateURLPatternType");//$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_URLPatternType_UI_"); //$NON-NLS-1$ = "Create URLPatternType"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("37concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type URLPatternType for the selected {0}."
- }
-
- /**
- * This returns web_resource_collection.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("web_resource_collection");//$NON-NLS-1$
- }
-
- /**
- * This returns the secConstraint of the WebResourceCollection.
- */
- public Object getParent(Object object) {
- return ((WebResourceCollection) object).getSecConstraint();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the webResourceName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebResourceName_UI_"), //$NON-NLS-1$ = "WebResourceName"
- WebAppEditResourceHandler.getString("The_webResourceName_proper_UI_"), //$NON-NLS-1$ = "The webResourceName property"
- pkg.getWebResourceCollection_WebResourceName()));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getWebResourceCollection_Description()));
-
- // This is for the secConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
- WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
- pkg.getWebResourceCollection_SecConstraint()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Web Resource Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWebResourceNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_webResourceName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_webResourceName_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_WebResourceName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_description_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_urlPattern_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Http Method feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHttpMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_httpMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_httpMethod_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_HttpMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
- // return WebAppEditResourceHandler.getString("38concat_UI_", (new Object[] {
- // ((WebResourceCollection)object).getWebResourceName() })); //$NON-NLS-1$ =
- // "WebResourceCollection {0}"
- return ((WebResourceCollection) object).getWebResourceName();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebResourceCollection.class)) {
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(((WebResourceCollection) WebapplicationPackage.eINSTANCE.getWebResourceCollection()).getURLs(), WebapplicationFactory.eINSTANCE.createURLPatternType()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebResourceCollection_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebResourceCollection_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
- newChildDescriptors.add(createChildParameter(((WebResourceCollection) WebapplicationPackage.eINSTANCE.getWebResourceCollection()).getHttpMethod(), WebapplicationFactory.eINSTANCE.createHTTPMethodType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.IEditingDomainItemProvider#createCommand(java.lang.Object,
- * org.eclipse.emf.edit.domain.EditingDomain, java.lang.Class,
- * org.eclipse.emf.edit.command.CommandParameter)
- */
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- EStructuralFeature sf = commandParameter.getEReference();
- if (sf == null) {
- sf = commandParameter.getEAttribute();
- if (sf != null && !sf.isMany())
- sf = null;
- }
- if (sf != null) {
- EObject owner = commandParameter.getEOwner();
- Collection collection = commandParameter.getCollection();
- if (commandClass == AddCommand.class) {
- return createAddCommand(editingDomain, owner, sf, collection, commandParameter.getIndex());
- } else if (commandClass == RemoveCommand.class) {
- return createRemoveCommand(editingDomain, owner, sf, collection);
- }
- }
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java
deleted file mode 100644
index 11a3640..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java
+++ /dev/null
@@ -1,142 +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.jst.j2ee.internal.web.providers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-
-/**
- * Insert the type's description here. Creation date: (12/11/2000 5:54:28 PM)
- *
- * @author: Administrator
- */
-public class WebToolingItemPropertyDescriptor extends ItemPropertyDescriptor {
-
- protected int cellEditorType = -1;
- public final static int SMALL_ICON_EDITOR = 1;
- public final static int LARGE_ICON_EDITOR = 2;
- public final static int MULTILINE_TEXT_EDITOR = 3;
- public final static int AUTH_CONSTRAINT_ROLES_EDITOR = 4;
-
- /**
- * This creates an instance where the category and filter flags are empty and the cell editor is
- * determined for the references.
- */
- public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EReference[] parentReferences) {
- super(adapterFactory, displayName, description, parentReferences);
- }
-
- /**
- * This creates an instance where the category is filter flags are empty and the cell editor is
- * determined from the type of the structural feature>
- */
- public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EStructuralFeature feature) {
- super(adapterFactory, displayName, description, feature);
- }
-
- /**
- * This creates an instance where the category is filter flags are empty and the cell editor is
- * determined from the type of the structural feature>
- */
- public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EStructuralFeature feature, int newCellEditorType) {
- super(adapterFactory, displayName, description, feature);
- cellEditorType = newCellEditorType;
- }
-
- protected void executeCommand(EditingDomain editingDomain, Command command) {
- //TODO We need to use the CommandStack from the WebEditModel.
- // if (editingDomain instanceof StructuredTextEditingDomain)
- // ((StructuredTextEditingDomain) editingDomain).execute(command);
- // else
- // editingDomain.getCommandStack().execute(command);
-
- }
-
- /**
- * Returns the editor type.
- */
- public int getCellEditorType() {
- return cellEditorType;
- }
-
- /**
- * This does the delegated job of setting the property to the given value. It is implemented in
- * a generic way using the structural feature.
- */
- public void setPropertyValue(Object object, Object value) {
- EObject refObject = (EObject) object;
- EditingDomain editingDomain = getEditingDomain(object);
-
- if (parentReferences != null) {
- EObject refValue = (EObject) value;
- Command removeCommand = null;
- for (int i = 0; i < parentReferences.length; ++i) {
- Object oldValue = refObject.eGet(parentReferences[i]);
- if (oldValue != null) {
- final EReference parentReference = parentReferences[i];
- if (oldValue == value) {
- return;
- }
- // else if (refValue.refIsInstanceOf(parentReference.getEType(), true))
- else if (refValue.eClass() == parentReference.getEType() || refValue.eClass().getEAllSuperTypes().contains(parentReference.getEType())) {
- if (editingDomain == null) {
- refObject.eSet(parentReference, value);
- } else {
- Command setCommand = SetCommand.create(editingDomain, refObject, parentReference, value);
- executeCommand(editingDomain, setCommand);
- }
- return;
- } else {
- if (editingDomain == null) {
- refObject.eSet(parentReference, null);
- } else {
- removeCommand = SetCommand.create(editingDomain, refObject, parentReference, null);
- }
- break;
- }
- }
- }
-
- for (int i = 0; i < parentReferences.length; ++i) {
- final EReference parentReference = parentReferences[i];
- //if (refValue.refIsInstanceOf(parentReference.getEType(), true))
- if (refValue.eClass() == parentReference.getEType() || refValue.eClass().getEAllSuperTypes().contains(parentReference.getEType())) {
- if (editingDomain == null) {
- refObject.eSet(parentReferences[i], value);
- } else {
- if (removeCommand != null) {
- final CompoundCommand compoundCommand = new CompoundCommand(CompoundCommand.LAST_COMMAND_ALL);
- compoundCommand.append(removeCommand);
- compoundCommand.append(SetCommand.create(editingDomain, refObject, parentReference, value));
- executeCommand(editingDomain, compoundCommand);
- } else {
- executeCommand(editingDomain, SetCommand.create(editingDomain, refObject, parentReference, value));
- }
- }
- break;
- }
- }
- } else {
- if (editingDomain == null) {
- refObject.eSet(feature, value);
- } else {
- executeCommand(editingDomain, SetCommand.create(editingDomain, refObject, feature, value));
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
deleted file mode 100644
index f9c7cd2..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
+++ /dev/null
@@ -1,104 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}object.
- */
-public class WebTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WebTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns web_type.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("web_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;;
-
- }
- return itemPropertyDescriptors;
- }
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("WebType_UI_"); //$NON-NLS-1$ = "WebType"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
deleted file mode 100644
index fa80205..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
+++ /dev/null
@@ -1,118 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-/**
- * This extended item provider supports two addition features, (@link CreateChildCommand} and
- * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
- * adapters using this common base class.
- */
-public class WebapplicationItemProviderAdapter extends org.eclipse.emf.edit.provider.ItemProviderAdapter {
-
- /**
- * This creates and instance from an adapter factory and a domain notifier.
- */
- protected WebapplicationItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This implements the default behavior for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- return null;
- }
-
- /**
- * This creates the default new children for {@link CreateChildrenCommand}.
- */
- public Collection createChildren(Object object) {
- return Collections.EMPTY_LIST;
- }
-
- /**
- * This returns the default create child image.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebPlugin.getDefault().getImage("create_child"); //$NON-NLS-1$
- }
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "Create" + //$NON-NLS-1$
- ((EReference) achildrenReferences.iterator().next()).getEType().getName());
-
- }
-
- /**
- * This returns the default create children label.
- */
- public String getCreateChildrenText(Object object) {
- //EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("Create_Two_Children_UI_"); //$NON-NLS-1$ = "Create Two Children"
- }
- return WebAppEditResourceHandler.getString("9concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create Two {0}s"
-
- }
-
- /**
- * This returns the default create children help text.
- */
- public String getCreateChildrenToolTipText(Object object) {
- EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("7concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create two new children for the selected {0}."
- }
- return WebAppEditResourceHandler.getString("8concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$
- //$NON-NLS-1$ = "Create two new children of type {0} for the selected {1}."
-
- }
-
- /**
- * This returns the default create child label.
- */
- public String getCreateChildText(Object object) {
- //EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$ = "Create Child"
- }
- return WebAppEditResourceHandler.getString("6concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create {0}"
-
- }
-
- /**
- * This returns the default create child help text.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("2concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a new child for the selected {0}."
- }
- return WebAppEditResourceHandler.getString("4concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$
- //$NON-NLS-1$ = "Create a child of type {0} for the selected {1}."
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
deleted file mode 100644
index 3cebe0b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,686 +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.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.ListenerItemProvider;
-import org.eclipse.jst.j2ee.webapplication.internal.util.WebapplicationAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
- * MOF adapter notificiations into {@link org.eclipse.jface.DomainEvent}s. The adapters also
- * support property sheets, see {@link com.ibm.itp.ui.api.propertysheet}.
- */
-public class WebapplicationItemProviderAdapterFactory extends WebapplicationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}.
- */
- protected Collection supportedTypes = new ArrayList();
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}
- * instances.
- */
- protected WebAppItemProvider webAppItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}instances.
- */
- protected ContextParamItemProvider contextParamItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}instances.
- */
- protected ErrorPageItemProvider errorPageItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}instances.
- */
- protected ExceptionTypeErrorPageItemProvider exceptionTypeErrorPageItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Filter}
- * instances.
- */
- protected FilterItemProvider filterItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}instances.
- */
- protected FilterMappingItemProvider filterMappingItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}instances.
- */
- protected ErrorCodeErrorPageItemProvider errorCodeErrorPageItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}instances.
- */
- protected WelcomeFileListItemProvider welcomeFileListItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}instances.
- */
- protected WelcomeFileItemProvider welcomeFileItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}instances.
- */
- protected TagLibRefItemProvider tagLibRefItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRefType}instances.
- */
- protected TagLibRefTypeItemProvider tagLibRefTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}instances.
- */
- protected SecurityConstraintItemProvider securityConstraintItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}instances.
- */
- protected WebResourceCollectionItemProvider webResourceCollectionItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances.
- */
- protected URLPatternTypeItemProvider uRLPatternTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances.
- */
- protected HTTPMethodTypeItemProvider hTTPMethodTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}instances.
- */
- protected AuthConstraintItemProvider authConstraintItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}instances.
- */
- protected UserDataConstraintItemProvider userDataConstraintItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}instances.
- */
- protected LoginConfigItemProvider loginConfigItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}instances.
- */
- protected FormLoginConfigItemProvider formLoginConfigItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}instances.
- */
- protected MimeMappingItemProvider mimeMappingItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}instances.
- */
- protected SessionConfigItemProvider sessionConfigItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}instances.
- */
- protected ServletMappingItemProvider servletMappingItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}instances.
- */
- protected ServletItemProvider servletItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}instances.
- */
- protected WebTypeItemProvider webTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}instances.
- */
- protected ServletTypeItemProvider servletTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances.
- */
- protected JSPTypeItemProvider jSPTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}instances.
- */
- protected InitParamItemProvider initParamItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}instances.
- */
- protected ListenerItemProvider listenerItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}instances.
- */
- protected RoleNameTypeItemProvider roleNameTypeItemProvider;
- protected Disposable disposable = new Disposable();
-
- /**
- * This constructs an instance from a domain notifier.
- */
- public WebapplicationItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- public Adapter adapt(Notifier target, Object adapterKey) {
- return super.adapt(target, this);
- }
-
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- public Adapter adaptNew(Notifier target, Object adapterType) {
- Adapter adapter = super.adaptNew(target, adapterType);
- disposable.add(adapter);
- return adapter;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}.
- */
- public Adapter createAuthConstraintAdapter() {
- if (authConstraintItemProvider == null) {
- authConstraintItemProvider = new AuthConstraintItemProvider(this);
- }
-
- return authConstraintItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}.
- */
- public Adapter createContextParamAdapter() {
- if (contextParamItemProvider == null) {
- contextParamItemProvider = new ContextParamItemProvider(this);
- }
-
- return contextParamItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}.
- */
- public Adapter createErrorCodeErrorPageAdapter() {
- if (errorCodeErrorPageItemProvider == null) {
- errorCodeErrorPageItemProvider = new ErrorCodeErrorPageItemProvider(this);
- }
-
- return errorCodeErrorPageItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}.
- */
- public Adapter createErrorPageAdapter() {
- if (errorPageItemProvider == null) {
- errorPageItemProvider = new ErrorPageItemProvider(this);
- }
-
- return errorPageItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}.
- */
- public Adapter createExceptionTypeErrorPageAdapter() {
- if (exceptionTypeErrorPageItemProvider == null) {
- exceptionTypeErrorPageItemProvider = new ExceptionTypeErrorPageItemProvider(this);
- }
-
- return exceptionTypeErrorPageItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Filter}.
- */
- public Adapter createFilterAdapter() {
- if (filterItemProvider == null) {
- filterItemProvider = new FilterItemProvider(this);
- }
-
- return filterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected LocalEncodingMappingListItemProvider localEncodingMappingListItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createLocalEncodingMappingListAdapter() {
- if (localEncodingMappingListItemProvider == null) {
- localEncodingMappingListItemProvider = new LocalEncodingMappingListItemProvider(this);
- }
-
- return localEncodingMappingListItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected LocalEncodingMappingItemProvider localEncodingMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createLocalEncodingMappingAdapter() {
- if (localEncodingMappingItemProvider == null) {
- localEncodingMappingItemProvider = new LocalEncodingMappingItemProvider(this);
- }
-
- return localEncodingMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}.
- */
- public Adapter createFilterMappingAdapter() {
- if (filterMappingItemProvider == null) {
- filterMappingItemProvider = new FilterMappingItemProvider(this);
- }
-
- return filterMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}.
- */
- public Adapter createFormLoginConfigAdapter() {
- if (formLoginConfigItemProvider == null) {
- formLoginConfigItemProvider = new FormLoginConfigItemProvider(this);
- }
-
- return formLoginConfigItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}.
- */
- public Adapter createHTTPMethodTypeAdapter() {
- if (hTTPMethodTypeItemProvider == null) {
- hTTPMethodTypeItemProvider = new HTTPMethodTypeItemProvider(this);
- }
-
- return hTTPMethodTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}.
- */
- public Adapter createInitParamAdapter() {
- if (initParamItemProvider == null) {
- initParamItemProvider = new InitParamItemProvider(this);
- }
-
- return initParamItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}.
- */
- public Adapter createListenerAdapter() {
- if (listenerItemProvider == null) {
- listenerItemProvider = new ListenerItemProvider(this);
- }
-
- return listenerItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}.
- */
- public Adapter createJSPTypeAdapter() {
- if (jSPTypeItemProvider == null) {
- jSPTypeItemProvider = new JSPTypeItemProvider(this);
- }
-
- return jSPTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected URLPatternTypeItemProvider urlPatternTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}.
- */
- public Adapter createLoginConfigAdapter() {
- if (loginConfigItemProvider == null) {
- loginConfigItemProvider = new LoginConfigItemProvider(this);
- }
-
- return loginConfigItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}.
- */
- public Adapter createMimeMappingAdapter() {
- if (mimeMappingItemProvider == null) {
- mimeMappingItemProvider = new MimeMappingItemProvider(this);
- }
-
- return mimeMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}.
- */
- public Adapter createRoleNameTypeAdapter() {
- if (roleNameTypeItemProvider == null) {
- roleNameTypeItemProvider = new RoleNameTypeItemProvider(this);
- }
-
- return roleNameTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}.
- */
- public Adapter createSecurityConstraintAdapter() {
- if (securityConstraintItemProvider == null) {
- securityConstraintItemProvider = new SecurityConstraintItemProvider(this);
- }
-
- return securityConstraintItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}.
- */
- public Adapter createServletAdapter() {
- if (servletItemProvider == null) {
- servletItemProvider = new ServletItemProvider(this);
- }
-
- return servletItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}.
- */
- public Adapter createServletMappingAdapter() {
- if (servletMappingItemProvider == null) {
- servletMappingItemProvider = new ServletMappingItemProvider(this);
- }
-
- return servletMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}.
- */
- public Adapter createServletTypeAdapter() {
- if (servletTypeItemProvider == null) {
- servletTypeItemProvider = new ServletTypeItemProvider(this);
- }
-
- return servletTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected JSPTypeItemProvider jspTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}.
- */
- public Adapter createSessionConfigAdapter() {
- if (sessionConfigItemProvider == null) {
- sessionConfigItemProvider = new SessionConfigItemProvider(this);
- }
-
- return sessionConfigItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}.
- */
- public Adapter createTagLibRefAdapter() {
- if (tagLibRefItemProvider == null) {
- tagLibRefItemProvider = new TagLibRefItemProvider(this);
- }
-
- return tagLibRefItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}.
- */
- public Adapter createTagLibRefTypeAdapter() {
- if (tagLibRefTypeItemProvider == null) {
- tagLibRefTypeItemProvider = new TagLibRefTypeItemProvider(this);
- }
-
- return tagLibRefTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}.
- */
- public Adapter createURLPatternTypeAdapter() {
- if (uRLPatternTypeItemProvider == null) {
- uRLPatternTypeItemProvider = new URLPatternTypeItemProvider(this);
- }
-
- return uRLPatternTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected HTTPMethodTypeItemProvider httpMethodTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}.
- */
- public Adapter createUserDataConstraintAdapter() {
- if (userDataConstraintItemProvider == null) {
- userDataConstraintItemProvider = new UserDataConstraintItemProvider(this);
- }
-
- return userDataConstraintItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}.
- */
- public Adapter createWebAppAdapter() {
- if (webAppItemProvider == null) {
- webAppItemProvider = new WebAppItemProvider(this);
- }
-
- return webAppItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}.
- */
- public Adapter createWebResourceCollectionAdapter() {
- if (webResourceCollectionItemProvider == null) {
- webResourceCollectionItemProvider = new WebResourceCollectionItemProvider(this);
- }
-
- return webResourceCollectionItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}.
- */
- public Adapter createWebTypeAdapter() {
- if (webTypeItemProvider == null) {
- webTypeItemProvider = new WebTypeItemProvider(this);
- }
-
- return webTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}.
- */
- public Adapter createWelcomeFileAdapter() {
- if (welcomeFileItemProvider == null) {
- welcomeFileItemProvider = new WelcomeFileItemProvider(this);
- }
-
- return welcomeFileItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}.
- */
- public Adapter createWelcomeFileListAdapter() {
- if (welcomeFileListItemProvider == null) {
- welcomeFileListItemProvider = new WelcomeFileListItemProvider(this);
- }
-
- return welcomeFileListItemProvider;
- }
-
- public void dispose() {
- disposable.dispose();
- }
-
- /**
- * This returns the root adapter factory that contains the factory.
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return (parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory());
- }
-
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This sets the composed adapter factory that contains the factory.
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
deleted file mode 100644
index 7ea31c7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
+++ /dev/null
@@ -1,145 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}object.
- */
-public class WelcomeFileItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WelcomeFileItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns welcome_file.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("welcome_file");//$NON-NLS-1$
- }
-
- /**
- * This returns the fileList of the WelcomeFile.
- */
- public Object getParent(Object object) {
- return ((WelcomeFile) object).getFileList();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the welcomeFile feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WelcomeFile_UI_"), //$NON-NLS-1$ = "WelcomeFile"
- WebAppEditResourceHandler.getString("The_welcomeFile_property_UI_"), //$NON-NLS-1$ = "The welcomeFile property"
- pkg.getWelcomeFile_WelcomeFile()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Welcome File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWelcomeFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WelcomeFile_welcomeFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WelcomeFile_welcomeFile_feature", "_UI_WelcomeFile_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWelcomeFile_WelcomeFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- WelcomeFile welcomeFile = (WelcomeFile) object;
- String name = welcomeFile.getWelcomeFile();
- if (name == null)
- name = WebAppEditResourceHandler.getString("<welcome-file>_UI_"); //$NON-NLS-1$ = "<welcome-file>"
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WelcomeFile.class)) {
- case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
deleted file mode 100644
index 6893d09..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
+++ /dev/null
@@ -1,161 +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.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}
- * object.
- */
-public class WelcomeFileListItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WelcomeFileListItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- WelcomeFile child = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- return Collections.singleton(WebapplicationPackage.eINSTANCE.getWelcomeFileList_File());
- }
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateWelcomeFile");//$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_WelcomeFile_UI_"); //$NON-NLS-1$ = "Create WelcomeFile"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("42concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type WelcomeFile for the selected {0}."
- }
-
- /**
- * This returns welcome_list.gif.
- */
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("welcome_list");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the WelcomeFileList.
- */
- public Object getParent(Object object) {
- return ((WelcomeFileList) object).getWebApp();
- }
-
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Welcome_File_List_UI_"); //$NON-NLS-1$ = "Welcome File List"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WelcomeFileList.class)) {
- case WebapplicationPackage.WELCOME_FILE_LIST__FILE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWelcomeFileList_File(), WebapplicationFactory.eINSTANCE.createWelcomeFile()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java
deleted file mode 100644
index 34c0477..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java
+++ /dev/null
@@ -1,90 +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.jst.j2ee.internal.web.archive.operations;
-
-
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-public class WTProjectStrategyUtils {
- public static File findSourceFile(Archive archive, String file) {
- if (isClassFile(file))
- return findSourceFileForClass(archive, file);
-
- // Look in the CLASSES directory
- try {
- if (!isOutputFile(file))
- return archive.getFile(file);
- } catch (java.io.FileNotFoundException ex) {
- //Do nothing
- }
- return null;
- }
-
- public static File findSourceFileForClass(Archive archive, String classFile) {
- // Look in the CLASSES directory
- IPath classFilePath = new Path(classFile);
- IPath sourceFilePath = classFilePath.removeFileExtension().addFileExtension("java");//$NON-NLS-1$
- try {
- File file = archive.getFile(sourceFilePath.toString());
- if (file != null)
- return file;
- } catch (java.io.FileNotFoundException ex) {
- //Do nothing
- }
-
- // Look in the LIB directory
- sourceFilePath = new Path(ArchiveConstants.WEBAPP_LIB_URI).append(sourceFilePath);
- try {
- File file = archive.getFile(sourceFilePath.toString());
- if (file != null)
- return file;
- } catch (java.io.FileNotFoundException ex) {
- //Do nothing
- }
- return null;
-
- }
-
- public static boolean isClassFile(String uri) {
- return uri.startsWith(ArchiveConstants.WEBAPP_CLASSES_URI) && uri.endsWith(".class");//$NON-NLS-1$
- }
-
- public static boolean isOutputFile(String uri) {
- return uri.startsWith(ArchiveConstants.WEBAPP_CLASSES_URI);
- }
-
- public static boolean isSourceFile(String uri) {
- // A file is considered a java source file if it is in the
- // WEB_INF directory and it does not end with .class.
- if (uri.startsWith(J2EEConstants.WEB_INF + "/") && //$NON-NLS-1$
- uri.endsWith(".java"))//$NON-NLS-1$
- return true;
- return false;
-
- }
-
- public static String makeRelative(String pathString, String relToPathString) {
- IPath relToPath = new Path(relToPathString);
- IPath path = new Path(pathString);
-
- if (path.matchingFirstSegments(relToPath) == relToPath.segmentCount())
- path = path.removeFirstSegments(relToPath.segmentCount());
-
- return path.toString();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModelProvider.java
deleted file mode 100644
index a4fba1d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,320 +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.jst.j2ee.internal.web.archive.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddWebComponentToEARDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-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.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * @deprecated
- * @see WebFacetProjectCreationDataModelProvider
- */
-
-public class WebComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IWebComponentCreationDataModelProperties {
-
- public WebComponentCreationDataModelProvider() {
- super();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new WebComponentCreationFacetOperation(model);
- //return new WebComponentCreationOperation(model);
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(USE_ANNOTATIONS);
- propertyNames.add(CONTEXT_ROOT);
- propertyNames.add(WEBCONTENT_FOLDER);
- return propertyNames;
- }
-
- /**
- * @return Returns the default J2EE spec level based on the Global J2EE Preference
- */
- protected Integer getDefaultComponentVersion() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- switch (highestJ2EEPref) {
- case (J2EEVersionConstants.J2EE_1_4_ID) :
- return new Integer(J2EEVersionConstants.WEB_2_4_ID);
- case (J2EEVersionConstants.J2EE_1_3_ID) :
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
- case (J2EEVersionConstants.J2EE_1_2_ID) :
- return new Integer(J2EEVersionConstants.WEB_2_2_ID);
- default :
- return new Integer(J2EEVersionConstants.WEB_2_4_ID);
- }
- }
-
- public AddComponentToEnterpriseApplicationDataModelProvider createAddComponentToEAR() {
- return new AddWebComponentToEARDataModelProvider();
- }
-
- public void init() {
- super.init();
- // setJ2EENatureID(IWebNatureConstants.J2EE_NATURE_ID);
- // setProperty(EDIT_MODEL_ID, IWebNatureConstants.EDIT_MODEL_ID);
- // getProjectDataModel().setProperty(ProjectCreationDataModel.PROJECT_NATURES, new
- // String[]{IModuleConstants.MODULE_NATURE_ID});
- // getJavaProjectCreationDataModel().setProperty(JavaProjectCreationDataModel.SOURCE_FOLDERS,
- // new String[]{getDefaultJavaSourceFolderName()});
-
- updateOutputLocation();
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean retVal = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(USE_ANNOTATIONS)) {
- model.notifyPropertyChange(COMPONENT_VERSION, DataModelEvent.ENABLE_CHG);
- } else if (propertyName.equals(CONTEXT_ROOT)) {
- getAddComponentToEARDataModel().setProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, propertyValue);
- } else if (propertyName.equals(COMPONENT_NAME)) {
- if (!isPropertySet(CONTEXT_ROOT)) {
- model.notifyPropertyChange(CONTEXT_ROOT, DataModelEvent.VALUE_CHG);
- getAddComponentToEARDataModel().setProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, propertyValue);
- getAddComponentToEARDataModel().notifyPropertyChange(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, IDataModel.DEFAULT_CHG);
- }
- } else if (propertyName.equals(WEBCONTENT_FOLDER)) {
- model.setProperty(DD_FOLDER, "/" + propertyValue + IPath.SEPARATOR + J2EEConstants.WEB_INF); //$NON-NLS-1$
- model.setProperty(MANIFEST_FOLDER, "/" + propertyValue + IPath.SEPARATOR + J2EEConstants.META_INF); //$NON-NLS-1$
-
- }
- return retVal;
- }
-
- private void updateOutputLocation() {
- // getJavaProjectCreationDataModel().setProperty(JavaProjectCreationDataModel.OUTPUT_LOCATION,
- // getOutputLocation());
- }
-
- // private Object getOutputLocation() {
- // StringBuffer buf = new StringBuffer(getStringProperty(WEB_CONTENT));
- // buf.append(IPath.SEPARATOR);
- // buf.append(IWebNatureConstants.INFO_DIRECTORY);
- // buf.append(IPath.SEPARATOR);
- // buf.append(IWebNatureConstants.CLASSES_DIRECTORY);
- // return buf.toString();
- // }
-
-
-
- public Object getDefaultProperty(String propertyName) {
-// if (propertyName.equals(ADD_TO_EAR)) {
-// if (isEARSupported())
-// setProperty(ADD_TO_EAR, Boolean.TRUE);
-// }
- // if (propertyName.equals(WEB_CONTENT)) {
- // String webContentFolderPref =
- // J2EEPlugin.getDefault().getJ2EEPreferences().getJ2EEWebContentFolderName();
- // if (webContentFolderPref == null || webContentFolderPref.length() == 0)
- // webContentFolderPref = IWebNatureConstants.WEB_MODULE_DIRECTORY_;
- // return webContentFolderPref;
- // }
- if (propertyName.equals(CONTEXT_ROOT)) {
- return getProperty(COMPONENT_NAME);
- }
- // To do: after porting
- // if (propertyName.equals(SERVLET_VERSION)) {
- // int moduleVersion = getIntProperty(COMPONENT_VERSION);
- // int servletVersion = J2EEVersionConstants.SERVLET_2_2;
- // switch (moduleVersion) {
- // case J2EEVersionConstants.WEB_2_2_ID :
- // servletVersion = J2EEVersionConstants.SERVLET_2_2;
- // break;
- // case J2EEVersionConstants.WEB_2_3_ID :
- // case J2EEVersionConstants.WEB_2_4_ID :
- // servletVersion = J2EEVersionConstants.SERVLET_2_3;
- // break;
- // }
- // return new Integer(servletVersion);
- // }
- // if (propertyName.equals(JSP_VERSION)) {
- // int moduleVersion = getIntProperty(COMPONENT_VERSION);
- // int jspVersion = J2EEVersionConstants.JSP_1_2_ID;
- // switch (moduleVersion) {
- // case J2EEVersionConstants.WEB_2_2_ID :
- // jspVersion = J2EEVersionConstants.JSP_1_2_ID;
- // break;
- // case J2EEVersionConstants.WEB_2_3_ID :
- // case J2EEVersionConstants.WEB_2_4_ID :
- // jspVersion = J2EEVersionConstants.JSP_2_0_ID;
- // break;
- // }
- // return new Integer(jspVersion);
- // }
- if (propertyName.equals(DD_FOLDER)) {
- return IPath.SEPARATOR + WebArtifactEdit.WEB_CONTENT + IPath.SEPARATOR + J2EEConstants.WEB_INF;
- }
- if (propertyName.equals(JAVASOURCE_FOLDER)) {
- return CreationConstants.DEFAULT_WEB_SOURCE_FOLDER;
- }
- if (propertyName.equals(MANIFEST_FOLDER)) {
- return IPath.SEPARATOR + WebArtifactEdit.WEB_CONTENT + IPath.SEPARATOR + J2EEConstants.META_INF;
- } else if (propertyName.equals(WEBCONTENT_FOLDER)) {
- return WebArtifactEdit.WEB_CONTENT;
-
- } else if (propertyName.equals(MODULE_URI)) {
- return getProject().getName()+IJ2EEModuleConstants.WAR_EXT;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
- if (propertyName.equals(COMPONENT_VERSION)) {
- Integer propertyValue = (Integer) getProperty(propertyName);
- String description = null;
- switch (propertyValue.intValue()) {
- case J2EEVersionConstants.WEB_2_2_ID :
- description = J2EEVersionConstants.VERSION_2_2_TEXT;
- break;
- case J2EEVersionConstants.WEB_2_3_ID :
- description = J2EEVersionConstants.VERSION_2_3_TEXT;
- break;
- case J2EEVersionConstants.WEB_2_4_ID :
- default :
- description = J2EEVersionConstants.VERSION_2_4_TEXT;
- break;
- }
- return new DataModelPropertyDescriptor(propertyValue, description);
- }
- return super.getPropertyDescriptor(propertyName);
- }
-
- protected DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- DataModelPropertyDescriptor[] descriptors = null;
- switch (highestJ2EEPref) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- descriptors = new DataModelPropertyDescriptor[1];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_2_ID), J2EEVersionConstants.VERSION_2_2_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_3_ID :
- descriptors = new DataModelPropertyDescriptor[2];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_2_ID), J2EEVersionConstants.VERSION_2_2_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_3_ID), J2EEVersionConstants.VERSION_2_3_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_4_ID :
- default :
- descriptors = new DataModelPropertyDescriptor[3];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_2_ID), J2EEVersionConstants.VERSION_2_2_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_3_ID), J2EEVersionConstants.VERSION_2_3_TEXT);
- descriptors[2] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_4_ID), J2EEVersionConstants.VERSION_2_4_TEXT);
- break;
- }
- return descriptors;
- }
-
- protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
- switch (moduleVersion) {
- case J2EEVersionConstants.WEB_2_2_ID :
- return J2EEVersionConstants.J2EE_1_2_ID;
- case J2EEVersionConstants.WEB_2_3_ID :
- return J2EEVersionConstants.J2EE_1_3_ID;
- case J2EEVersionConstants.WEB_2_4_ID :
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
- return -1;
- }
-
- protected Integer convertJ2EEVersionToModuleVersion(Integer j2eeVersion) {
- switch (j2eeVersion.intValue()) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- return new Integer(J2EEVersionConstants.WEB_2_2_ID);
- case J2EEVersionConstants.J2EE_1_3_ID :
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
- case J2EEVersionConstants.J2EE_1_4_ID :
- return new Integer(J2EEVersionConstants.WEB_2_4_ID);
- }
- return super.convertJ2EEVersionToModuleVersion(j2eeVersion);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEModuleCreationDataModel#getModuleType()
- */
- protected EClass getComponentType() {
- return CommonarchivePackage.eINSTANCE.getWARFile();
- }
-
- protected String getComponentExtension() {
- return ".war"; //$NON-NLS-1$
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (USE_ANNOTATIONS.equals(propertyName)) {
- if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
- return false;
- return true;
- }
- return super.isPropertyEnabled(propertyName);
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(CONTEXT_ROOT)) {
- if (getBooleanProperty(ADD_TO_EAR)) {
- return getAddComponentToEARDataModel().validateProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT);
- }
- return OK_STATUS;
- } else if (propertyName.equals(WEBCONTENT_FOLDER)) {
- IStatus status = OK_STATUS;
- String webFolderName = model.getStringProperty(WEBCONTENT_FOLDER);
- if (webFolderName == null || webFolderName.length() == 0) {
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.WEBCONTENTFOLDER_EMPTY);
- status = WTPCommonPlugin.createErrorStatus(errorMessage);
- return status;
- }
- }
- return super.validate(propertyName);
- }
-
- public void propertyChanged(DataModelEvent event) {
- super.propertyChanged(event);
- if (event.getDataModel() == getAddComponentToEARDataModel() && event.getPropertyName().equals(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT) && event.getDataModel().isPropertySet(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT)) {
- setProperty(CONTEXT_ROOT, event.getProperty());
- }
- // else if (event.getDataModel() == getServerTargetDataModel() &&
- // event.getPropertyName().equals(ServerTargetDataModel.RUNTIME_TARGET_ID) &&
- // event.getDataModel().isSet(ServerTargetDataModel.RUNTIME_TARGET_ID))
- // setProperty(ADD_TO_EAR, updateAddToEar());
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- protected String getJ2EEProjectType() {
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationFacetOperation.java
deleted file mode 100644
index b824de1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,78 +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.jst.j2ee.internal.web.archive.operations;
-
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEComponentCreationFacetOperation;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation {
-
- public WebComponentCreationFacetOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(setupJavaInstallAction());
- IDataModel newModel = setupWebInstallAction();
- map.add(newModel);
- setRuntime(newModel, dm); // Setting runtime property
- setAddToEARFromWizard(newModel);
- IStatus stat = dm.getDefaultOperation().execute(monitor, info);
- if (stat.isOK()) {
- String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- if (earProject != null && earProject.exists())
- stat = addtoEar(projectName, earProjectName);
- }
-
- return stat;
- }
-
- protected IDataModel setupWebInstallAction() {
- String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
- IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
- webFacetInstallDataModel.setProperty(IWebFacetInstallDataModelProperties.CONFIG_FOLDER, model.getStringProperty(IWebComponentCreationDataModelProperties.WEBCONTENT_FOLDER));
- webFacetInstallDataModel.setProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT, model.getStringProperty(IWebComponentCreationDataModelProperties.CONTEXT_ROOT));
- webFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
- if (model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR)) {
- webFacetInstallDataModel.setProperty(IWebFacetInstallDataModelProperties.EAR_PROJECT_NAME, model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
- }
- webFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, model.getProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
-
- webFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(IJ2EEComponentCreationDataModelProperties.RUNTIME_TARGET_ID));
- return webFacetInstallDataModel;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java
deleted file mode 100644
index a749b68..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,86 +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.jst.j2ee.internal.web.archive.operations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentExportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class WebComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider implements IWebComponentExportDataModelProperties {
-
- public WebComponentExportDataModelProvider() {
- super();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new WebComponentExportOperation(model);
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EXCLUDE_COMPILE_JSP);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (EXCLUDE_COMPILE_JSP.equals(propertyName)) {
- return Boolean.FALSE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected String getProjectType() {
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-
- protected String getWrongComponentTypeString(String projectName) {
- return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_A_WAR, new Object[]{projectName});
- }
-
- protected String getModuleExtension() {
- return ".war"; //$NON-NLS-1$
- }
- /**
- * Exports the specified Web Module project to the specified WAR file.
- *
- * @param webProjectName
- * The name of the Web Module project to export.
- * @param warFileName
- * The fully qualified WAR file location to export the specified Web Module project.
- * @param overwriteExisting
- * If this is <code>true</code> then an existing file at the location specified by
- * <code>earFileName</code> will be overwritten.
- * @param exportSource
- * If this is <code>true</code> then all source files in the specified Web Module
- * will be included in the resulting WAR file.
- * @plannedfor WTP 1.0
- */
- // TODO: determine plan for new DM Provider
- // public static void exportProject(String webProjectName, String warFileName, boolean
- // overwriteExisting, boolean exportSource) {
- // WebModuleExportDataModel dataModel = new WebModuleExportDataModel();
- // dataModel.setProperty(PROJECT_NAME, webProjectName);
- // dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
- // dataModel.setProperty(ARCHIVE_DESTINATION, warFileName);
- // dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
- // try {
- // dataModel.getDefaultOperation().run(null);
- // } catch (InvocationTargetException e) {
- // Logger.getLogger().logError(e);
- // } catch (InterruptedException e) {
- // Logger.getLogger().logError(e);
- // }
- // }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java
deleted file mode 100644
index 2cb7bde..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java
+++ /dev/null
@@ -1,51 +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.jst.j2ee.internal.web.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientArchiveOpsResourceHandler;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentExportOperation extends J2EEArtifactExportOperation {
-
- public WebComponentExportOperation() {
- super();
- }
-
- public WebComponentExportOperation(IDataModel model) {
- super(model);
- }
-
- protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
- try {
- CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
- WebComponentLoadStrategyImpl ls = new WebComponentLoadStrategyImpl(getComponent());
- ls.setExportSource(isExportSource());
- setModuleFile(caf.openWARFile(ls, getDestinationPath().toOSString()));
- getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
- } catch (SaveFailureException ex) {
- throw ex;
- } catch (Exception e) {
- throw new SaveFailureException(AppClientArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
- } }
-
- protected String archiveString() {
- return "War File";
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java
deleted file mode 100644
index 8f9483a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,100 +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.jst.j2ee.internal.web.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * This dataModel is used for to import Web Modules (from WAR files) into the workspace.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public final class WebComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider implements IWebComponentImportDataModelProperties {
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(WEB_LIB_MODELS);
- propertyNames.add(WEB_LIB_ARCHIVES_SELECTED);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(WEB_LIB_MODELS) || propertyName.equals(WEB_LIB_ARCHIVES_SELECTED)) {
- return Collections.EMPTY_LIST;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected int getType() {
- return XMLResource.WEB_APP_TYPE;
- }
-
- protected IStatus validateModuleType() {
- if (getArchiveFile() instanceof WARFile)
- return OK_STATUS;
-
- // TODO: STRING MOVE
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString("Temp String for none WARFile")); //$NON-NLS-1$);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(FILE)) {
- Archive archive = (Archive) propertyValue;
- if (null != archive) {
- WARFile war = (WARFile) archive;
- List libs = war.getLibArchives();
- List nestedModels = new ArrayList();
- for (int i = 0; i < libs.size(); i++) {
- IDataModel localModel = DataModelFactory.createDataModel(new J2EEUtilityJarImportDataModelProvider());
- localModel.setProperty(FILE, libs.get(i));
- nestedModels.add(localModel);
- }
- setProperty(WEB_LIB_MODELS, nestedModels);
- }
- }
- return true;
- }
-
- protected Archive openArchive(String uri) throws OpenFailureException {
- Archive archive = CommonarchiveFactory.eINSTANCE.openWARFile(getArchiveOptions(), uri);
- return archive;
- }
-
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new WebComponentCreationDataModelProvider());
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new WebComponentImportOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java
deleted file mode 100644
index d71167e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java
+++ /dev/null
@@ -1,136 +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.jst.j2ee.internal.web.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-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.web.internal.operation.ILibModule;
-import org.eclipse.wst.web.internal.operation.LibModule;
-
-public class WebComponentImportOperation extends J2EEArtifactImportOperation {
- /**
- * @param model
- */
- public WebComponentImportOperation(IDataModel model) {
- super(model);
- }
-
- protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
- super.doExecute(monitor);
- IVirtualFolder libFolder = virtualComponent.getRootFolder().getFolder(WebArtifactEdit.WEBLIB);
- if (!libFolder.exists()) {
- try {
- libFolder.create(IResource.FORCE, new NullProgressMonitor());
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- try {
- addExtraClasspathEntries(monitor);
- } catch (JavaModelException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
- private void addExtraClasspathEntries(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, CoreException, JavaModelException, ExecutionException {
- List extraEntries = null;
- IJavaProject javaProject = JavaCore.create(virtualComponent.getProject());
- extraEntries = new ArrayList();
- importWebLibraryProjects(monitor, extraEntries, javaProject);
- }
-
- private void importWebLibraryProjects(IProgressMonitor monitor, List extraEntries, IJavaProject javaProject) throws InvocationTargetException, InterruptedException, ExecutionException {
- List selectedLibs = (List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED);
- List libProjects = (List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_MODELS);
- IDataModel importModel = null;
- IVirtualComponent nestedComponent = null;
- ArrayList libModules = new ArrayList();
- String jarName = null;
- Archive libArchive = null;
- for (int i = 0; null != libProjects && i < libProjects.size(); i++) {
- importModel = (IDataModel) libProjects.get(i);
- libArchive = (Archive) importModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- if (selectedLibs.contains(libArchive)) {
- jarName = libArchive.getName();
- importModel.getDefaultOperation().execute(monitor, info);
- nestedComponent = (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
- libModules.add(new LibModule(jarName, nestedComponent.getProject().getName()));
- if (extraEntries != null) {
- if (!javaProject.isOnClasspath(nestedComponent.getProject())) {
- extraEntries.add(JavaCore.newProjectEntry(nestedComponent.getProject().getFullPath()));
- }
- }
- ComponentCore.createReference(virtualComponent, nestedComponent, new Path("/WEB-INF/lib/")).create(0, monitor); //$NON-NLS-1$
- }
- }
-
-
- LibModule[] libModulesArray = new LibModule[libModules.size()];
- for (int i = 0; i < libModules.size(); i++) {
- libModulesArray[i] = (LibModule) libModules.get(i);
- }
- setLibModules(javaProject.getProject(), libModulesArray);
- }
-
- protected void setLibModules(IProject project, ILibModule[] modules) {
- // TODO this will throw class cast exception, do we still use ILibModule?
- WebArtifactEdit webArtifactEdit = null;
- try {
- // TODO migrate to flex projects
- // webArtifactEdit =
- // (WebArtifactEdit)StructureEdit.getFirstArtifactEditForRead(project);
- if (webArtifactEdit != null)
- webArtifactEdit.addLibModules((ReferencedComponent[]) modules);
- } finally {
- if (webArtifactEdit != null)
- webArtifactEdit.dispose();
- }
- }
-
- protected SaveStrategy createSaveStrategy(IVirtualComponent aVirtualComponent) {
- return new WebComponentSaveStrategyImpl(aVirtualComponent);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
deleted file mode 100644
index 8d1f8d8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,87 +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.jst.j2ee.internal.web.archive.operations;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class WebComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
- public WebComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
- public List getFiles() {
- super.getFiles();
- addLooseLibJARsToFiles();
- return filesHolder.getFiles();
- }
-
- public IVirtualReference[] getLibModules() {
- WebArtifactEdit webArtifactEdit = null;
- try {
- webArtifactEdit = (WebArtifactEdit) ComponentUtilities.getArtifactEditForRead(getComponent());
- if (webArtifactEdit != null)
- return webArtifactEdit.getLibModules();
- } finally {
- if (webArtifactEdit != null)
- webArtifactEdit.dispose();
- }
- return null;
-
- }
-
- public void addLooseLibJARsToFiles() {
- IVirtualReference[] libModules = getLibModules();
- for (int i = 0; i < libModules.length; i++) {
- IVirtualReference iLibModule = libModules[i];
- IVirtualComponent looseComponent = iLibModule.getReferencedComponent();
- String uri = null;
- if (looseComponent.isBinary()) {
- VirtualArchiveComponent archiveComp = (VirtualArchiveComponent) looseComponent;
- java.io.File diskFile = archiveComp.getUnderlyingDiskFile();
- if (diskFile!=null && diskFile.exists()) {
- uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + diskFile.getName(); //$NON-NLS-1$
- addExternalFile(uri, diskFile);
- }
- else {
- IFile file = archiveComp.getUnderlyingWorkbenchFile();
- uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + file.getName(); //$NON-NLS-1$
- addWorkspaceFile(uri, file);
- }
-
- } else {
- uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + looseComponent.getName() + ".jar"; //$NON-NLS-1$//$NON-NLS-2$
- try {
- Archive utilJAR = J2EEProjectUtilities.asArchive(uri, looseComponent.getProject(), isExportSource());
- if (utilJAR == null)
- continue;
- filesHolder.addFile(utilJAR);
- } catch (OpenFailureException oe) {
- String message = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.UNABLE_TO_LOAD_MODULE_ERROR_, new Object[]{uri, getComponent().getProject().getName(), oe.getConcatenatedMessages()}); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logTrace(message);
- }
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java
deleted file mode 100644
index 97cf4fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,108 +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.jst.j2ee.internal.web.archive.operations;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentSaveStrategyImpl;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class WebComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
- public WebComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
- public void save(File aFile, FileIterator iterator) throws SaveFailureException {
- if (aFile.isArchive() && operationHandlesNested((Archive) aFile)) {
- return;
- }
- super.save(aFile, iterator);
- }
-
- protected boolean operationHandlesNested(Archive archive) {
- if (null != dataModel) {
- List list = (List) dataModel.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED);
- return list.contains(archive);
- }
- return false;
- }
-
- protected boolean shouldAddImportedClassesToClasspath() {
- return false; //never add to classpath because the web app container will pick this up.
- }
-
- protected String getImportedClassesURI(File aFile) {
- String uri = aFile.getURI();
- return WTProjectStrategyUtils.makeRelative(uri, ArchiveConstants.WEBAPP_CLASSES_URI);
- }
-
- protected IPath getImportedClassesRuntimePath() {
- return new Path("/" + ArchiveConstants.WEBAPP_CLASSES_URI);
- }
-
- protected IPath getOutputPathForFile(File aFile) {
- if (null != nonStandardSourceFiles && nonStandardSourceFiles.containsKey(aFile)) {
- return new Path((String) nonStandardSourceFiles.get(aFile));
- }
- return super.getOutputPathForFile(aFile);
- }
-
- /**
- * This map handles the case when a java source file is not in the same place as the .class
- * file. For example if all the source files were contained in WEB-INF/source
- */
- protected Map nonStandardSourceFiles;
-
- protected boolean isClassWithoutSource(File aFile) {
- String javaUri = ArchiveUtil.classUriToJavaUri(aFile.getURI());
- if (javaUri == null)
- return false;
- if (archive.containsFile(javaUri)) {
- return false;
- }
- // see if it is a JSP
- String jspUri = javaUri.substring(0, javaUri.indexOf(ArchiveUtil.DOT_JAVA));
- int lastSlash = jspUri.lastIndexOf('/');
- int _index = lastSlash == -1 ? ArchiveConstants.WEBAPP_CLASSES_URI.length() : lastSlash + 1;
- if (jspUri.charAt(_index) == '_') {
- jspUri = jspUri.substring(ArchiveConstants.WEBAPP_CLASSES_URI.length(), _index) + jspUri.substring(_index + 1) + ArchiveUtil.DOT_JSP;
- if (archive.containsFile(jspUri)) {
- return false;
- }
- }
-
- // see if the source is in another directory
- File sourceFile = ((WARFile) archive).getSourceFile(aFile);
- if (null == sourceFile) {
- return true;
- }
- if (nonStandardSourceFiles == null) {
- nonStandardSourceFiles = new HashMap();
- }
- if (!nonStandardSourceFiles.containsKey(nonStandardSourceFiles)) {
- nonStandardSourceFiles.put(sourceFile, javaUri);
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index ccc288c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.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.jst.j2ee.internal.web.archive.operations;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-public class WebFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider{
-
-
- public WebFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- map.add(javaFacet);
- IDataModel webFacet = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
- map.add(webFacet);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME,webFacet.getStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER));
-
- webFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
- setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
- }else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_EAR, event.getProperty());
- }
- }
- });
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppContainer.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppContainer.java
deleted file mode 100644
index fb71a4e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppContainer.java
+++ /dev/null
@@ -1,73 +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.jst.j2ee.internal.web.classpath;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainer;
-import org.eclipse.jst.j2ee.internal.web.operations.WebMessages;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebAppContainer
-
- extends FlexibleProjectContainer
-
-{
- private static final IPath[] paths
- = new IPath[] { new Path( "WEB-INF/lib" ),
- new Path( "WEB-INF/classes" ) };
-
- private static final PathType[] types
- = new PathType[] { PathType.LIB_DIRECTORY, PathType.CLASSES_DIRECTORY };
-
- public static final String CONTAINER_ID
- = "org.eclipse.jst.j2ee.internal.web.container";
-
- public WebAppContainer( final IPath path,
- final IJavaProject jproject )
- {
- super( path, jproject, jproject.getProject(), paths, types );
- }
-
- public String getDescription()
- {
- return WebMessages.WEB_CONT_DESCRIPTION;
- }
-
- public void install()
- {
- final IJavaProject[] projects = new IJavaProject[] { this.owner };
- final IClasspathContainer[] conts = new IClasspathContainer[] { this };
-
- try
- {
- JavaCore.setClasspathContainer( path, projects, conts, null );
- }
- catch( JavaModelException e )
- {
- WebPlugin.log( e );
- }
- }
-
- public void refresh()
- {
- ( new WebAppContainer( this.path, this.owner ) ).install();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppContainerInitializer.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppContainerInitializer.java
deleted file mode 100644
index 71b1d8a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppContainerInitializer.java
+++ /dev/null
@@ -1,37 +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.jst.j2ee.internal.web.classpath;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainerInitializer;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebAppContainerInitializer
-
- extends FlexibleProjectContainerInitializer
-
-{
- public void initialize( final IPath path,
- final IJavaProject jproj )
-
- throws CoreException
-
- {
- ( new WebAppContainer( path, jproj ) ).install();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java
deleted file mode 100644
index af75110..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java
+++ /dev/null
@@ -1,67 +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.jst.j2ee.internal.web.operations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-
-public class ClasspathUtilities {
-
- static public IClasspathEntry[] addClasspathEntries(IClasspathEntry[] entries1, IClasspathEntry[] entries2) {
- List list = new ArrayList(entries1.length + entries2.length);
- list.addAll(Arrays.asList(entries1));
-
- for (int i = 0; i < entries2.length; i++) {
- IClasspathEntry iClasspathEntry = entries2[i];
- if (!list.contains(iClasspathEntry))
- list.add(iClasspathEntry);
- }
-
- ClasspathEntry[] ret = new ClasspathEntry[list.size()];
- return (IClasspathEntry[]) list.toArray(ret);
- }
-
- static protected boolean entryExists(IClasspathEntry entry, IClasspathEntry[] col) {
- for (int i = 0; i < col.length; i++) {
- IClasspathEntry otherEntry = col[i];
- if (entry.getContentKind() != otherEntry.getContentKind())
- continue;
-
- if (entry.getEntryKind() != otherEntry.getEntryKind())
- continue;
-
- if (entry.isExported() != otherEntry.isExported())
- continue;
-
- if (!entry.getPath().equals(otherEntry.getPath()))
- continue;
- return true;
- }
- return false;
- }
-
- static public IClasspathEntry[] removeClasspathEntries(IClasspathEntry[] removeFromCol, IClasspathEntry[] removeCol) {
- List list = new ArrayList(removeFromCol.length);
- // list.addAll(Arrays.asList(removeFromCol));
-
- for (int i = 0; i < removeFromCol.length; i++) {
- IClasspathEntry iClasspathEntry = removeFromCol[i];
- if (!entryExists(iClasspathEntry, removeCol))
- list.add(iClasspathEntry);
- }
-
- ClasspathEntry[] ret = new ClasspathEntry[list.size()];
- return (IClasspathEntry[]) list.toArray(ret);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java
deleted file mode 100644
index e8de100..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java
+++ /dev/null
@@ -1,63 +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.jst.j2ee.internal.web.operations;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-
-public interface IWebProjectWizardInfo {
- /**
- * Adds entries to the class path for this project
- */
- public void addToClasspathEntries(IClasspathEntry[] entries);
-
- /**
- * Get the name of the specified project Creation date: (11/09/00 10:05:24 AM)
- *
- * @return java.lang.String
- */
- public String getProjectName();
-
- /**
- * Get the Enterprise Application Project
- */
- public String getEARProjectName();
-
- /**
- * Get the name of the web content folder. If not set then return the current default.
- */
- public String getWebContentName();
-
- /**
- * Set the name of the web content folder
- */
- public void setWebContentName(String name);
-
- /**
- * Get the name of the Java source folder If not set then return the current default.
- */
- public String getJavaSourceName();
-
- /**
- * Set the name of the Java source folder
- */
- public void setJavaSourceName(String name);
-
- /**
- * Return an Object for the assocated properties or null
- */
- public Object getProperty(String propertyName);
-
- /**
- * Set an Object for the assocated properties or null
- */
- public void setProperty(String propertyName, Object value);
-
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java
deleted file mode 100644
index 9c50530..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java
+++ /dev/null
@@ -1,34 +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.jst.j2ee.internal.web.operations;
-
-
-
-/*
- * The IConfigurationConstants are the list of tags that are usuable for specifying a web
- * application parameters via XML
- *
- * @see WebApplicationSpecification for the full DTD
- */
-
-public interface IWebToolingConstants {
-
- public String TRUE = "true"; //$NON-NLS-1$
- public String FALSE = "false"; //$NON-NLS-1$
-
- public String HTTP_PATH_PREFIX = "http://"; //$NON-NLS-1$
- public String INDEX_FILE = "index.html"; //$NON-NLS-1$
- public String HTTP_PARAMETER_SEPARATOR = "?"; //$NON-NLS-1$
- public String CONTENT_LENGTH_HEADER_KEY = "Content-Length"; //$NON-NLS-1$
-
- public String SENTENCE_TERMINATOR = "."; //$NON-NLS-1$
-
- public String POST_COMMAND = "POST"; //$NON-NLS-1$
- public String GET_COMMAND = "GET"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java
deleted file mode 100644
index 1d9eaaa..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java
+++ /dev/null
@@ -1,29 +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.jst.j2ee.internal.web.operations;
-
-/**
- * The IWebToolingCoreConstants are the constants required by the ITP core
- */
-public interface IWebToolingCoreConstants {
- public String PLUG_IN_ID = "com.ibm.etools.webtools"; //$NON-NLS-1$
- public String PROP_SERVLET_JAR = "com.ibm.etools.webtools.servletjar"; //$NON-NLS-1$
- public String PROP_WEBAS_JAR = "com.ibm.etools.webtools.webasjar"; //$NON-NLS-1$
- public String PROP_CLIENT_NAME = "com.ibm.etools.webtools.clientname"; //$NON-NLS-1$
- public String PROP_LINK_STYLE = "com.ibm.etools.webtools.linkstyle"; //$NON-NLS-1$
- public String PROP_MODIFY_LINK_PROMPT = "com.ibm.etools.webtools.modifyprompt"; //$NON-NLS-1$
- public String PROP_AUTO_MODIFY_LINK = "com.ibm.etools.webtools.automodify"; //$NON-NLS-1$
- public String JDT_IDENTIFIER = "org.eclipse.jdt.ui"; //$NON-NLS-1$
- public String RUNTIME_IDENTIFIER = "WebNatureRuntime"; //$NON-NLS-1$
- public String DOC_RELATIVE = "DOC_RELATIVE"; //$NON-NLS-1$
- public String DOC_ROOT_RELATIVE = "DOC_ROOT_RELATIVE"; //$NON-NLS-1$
- public String ICON_PATH = "icons"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java
deleted file mode 100644
index f17c1b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java
+++ /dev/null
@@ -1,33 +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.jst.j2ee.internal.web.operations;
-
-
-
-/**
- * Code generation class compiled from template file MasterCSS.tpl
- */
-public class MasterCSS implements WebToolingTemplate {
- private static final String TEXT_1 = "BODY\r\n{\r\n BACKGROUND-COLOR: #FFE4B5;\r\n COLOR: black;\r\n FONT-FAMILY: 'Times New Roman'\r\n}\r\nH1\r\n{\r\n COLOR: navy;\r\n FONT-FAMILY: 'Times New Roman';\r\n FONT-SIZE: x-large;\r\n FONT-WEIGHT: bolder;\r\n TEXT-TRANSFORM: capitalize\r\n}\r\nH2\r\n{\r\n COLOR: navy;\r\n FONT-FAMILY: 'Times New Roman';\r\n FONT-SIZE: large;\r\n FONT-WEIGHT: bolder;\r\n TEXT-TRANSFORM: capitalize\r\n}\r\nH3\r\n{\r\n COLOR: navy;\r\n FONT-FAMILY: 'Times New Roman';\r\n FONT-SIZE: large;\r\n FONT-WEIGHT: lighter;\r\n TEXT-TRANSFORM: capitalize\r\n}";//$NON-NLS-1$
- private static final String TEXT_2 = "\r\n";//$NON-NLS-1$
-
- /**
- * Code generation method
- *
- * @return String
- */
- public String generate(TemplateData data) {
- StringBuffer sb = new StringBuffer();
- sb.append(TEXT_1);
- sb.append(TEXT_2);
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ProjectSupportResourceHandler.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ProjectSupportResourceHandler.java
deleted file mode 100644
index e3c57f1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ProjectSupportResourceHandler.java
+++ /dev/null
@@ -1,65 +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.jst.j2ee.internal.web.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ProjectSupportResourceHandler extends NLS {
- private static final String BUNDLE_NAME = "ProjectSupport";//$NON-NLS-1$
-
- private ProjectSupportResourceHandler() {
- // Do not instantiate
- }
-
- public static String Folder_name_cannot_be_the_same_as_Java_source_folder_5;
- public static String Target_Update_Op;
- public static String Operation_failed_due_to_SA_ERROR_;
- public static String Creating_Web_Project____UI_;
- public static String Update_ClassPath__UI_;
- public static String Could_not_rename_____2;
- public static String A_web_project_must_be_open_and_must_exist_for_properties_to_be_edited_30;
- public static String Operation_failed_due_to_IO_ERROR_;
- public static String Cannot_clone_TaglibInfo_1_EXC_;
- public static String Syntax_Error_in_the_links_UI_;
- public static String Sync_WLP_Op;
- public static String Catalog_Lib_Directory__UI_;
- public static String Generated_by_Web_Tooling_23;
- public static String _1concat_EXC_;
- public static String File_Serving_Enabler_7;
- public static String Sychronize_Class_Path_UI_;
- public static String Auto_Generated___File_Enabler_9;
- public static String Not_a_web_project_29;
- public static String Names_cannot_begin_or_end_with_whitespace_5;
- public static String The_character_is_invalid_in_a_context_root;
- public static String _24concat_INFO_;
- public static String Folder_name_cannot_be_the_same_as_Java_class_folder_6;
- public static String The_path_for_the_links_sta_EXC_;
- public static String Operation_failed_due_to_Ja_ERROR_;
- public static String Folder_name_cannot_be_empty_2;
- public static String Error_importing_Module_Fil_EXC_;
- public static String Operation_failed_due_to_Co_ERROR_;
- public static String Folder_names_cannot_be_equal_4;
- public static String Could_not_read_TLD_15;
- public static String Folder_name_is_not_valid;
- public static String Invalid_Servlet_Level_set_on_WebNature_3_EXC_;
- public static String Set_ClassPath__UI_;
- public static String Context_Root_cannot_be_empty_2;
- public static String Error_while_saving_links_s_EXC_;
- public static String UNABLE_TO_LOAD_MODULE_ERROR_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ProjectSupportResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java
deleted file mode 100644
index dcafff0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java
+++ /dev/null
@@ -1,993 +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.jst.j2ee.internal.web.operations;
-
-
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This class stores the relationship between two files. In particular, this is an inLink and the
- * files which reference it.
- */
-public class RelationData {
- public class Link implements Cloneable {
-
- private String url;
- private int occurrences = 0;
-
- public Link(String newUrl, int occ) {
- url = newUrl;
- occurrences = occ;
- }
-
- /**
- * Returns an exact copy of this object.
- *
- * @return Created clone object
- */
- public Object clone() {
- return new Link(url, occurrences);
- }
-
- /**
- * Returns the url of the file that references this inLink
- *
- * @return String
- */
- public String getURL() {
- return url;
- }
-
- /**
- * Returns the number of times this file references the inLink
- *
- * @return int
- */
- public int getOccurrences() {
- return occurrences;
- }
-
- private int addOccurrence(int add) {
- occurrences = occurrences + add;
- return occurrences;
- }
-
- public String toString() {
- return url;
- }
- }
-
- // our relationship table. Key is a string which is the path of the inLink,
- // value is a vector of files that reference the inLink.
- protected Hashtable inLinksTable = null;
- protected Hashtable anchorsTable = null;
- private static final int INIT_HASH_TABLE_SIZE = 100;
- private static final int INIT_ANCHORS_HASH_TABLE_SIZE = 10;
- private boolean fileOk = false;
- private static final String LINK_STATE_FILE_NAME = "link_table_states.txt";//$NON-NLS-1$
- private static final String LINK_SERVERCONTEXTROOT_FILE_NAME = "link_scr_states.txt";//$NON-NLS-1$
- public static final String LINK_MISSING_FILE = "-";//$NON-NLS-1$
- public static final String LINK_INDEX_SEPARATOR = "+";//$NON-NLS-1$
- public static final String ANCHOR_INDEX_SEPARATOR = "#";//$NON-NLS-1$
- public static final String LINK_OCCURENCE_SEPARATOR = "/";//$NON-NLS-1$
- public static final String ANCHOR_SEPARATOR = "#### ANCHORS ####";//$NON-NLS-1$
-
- /**
- * RelationData constructor comment.
- */
- public RelationData() {
- super();
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
- anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
- }
-
- public Link addInLink(String file_path, String parent_path, int occurence) {
- Vector in_links = (Vector) inLinksTable.get(file_path);
- if (in_links == null) {
- return null;
- }
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- //
- // Increment the occurence and return
- //
-
- if (url.compareTo(parent_path) == 0) {
- inlnk.addOccurrence(occurence);
- return inlnk;
- }
- }
-
- //
- // The link does not exist, need to add an entry in the table for it
- //
-
- Link inlnk = new Link(parent_path, occurence);
- in_links.addElement(inlnk);
- return inlnk;
- }
-
- public void changeInLink(String filePath, boolean missing) {
-
- if (missing) {
- Vector inlinks = (Vector) inLinksTable.remove(filePath);
- inLinksTable.put(LINK_MISSING_FILE + filePath, inlinks);
- } else {
- Vector inlinks = (Vector) inLinksTable.remove(LINK_MISSING_FILE + filePath);
- inLinksTable.put(filePath, inlinks);
- }
- }
-
-
- /*
- * returns which projects depend on this file i.e. any projects that are in this file's list of
- * in_links
- */
- public Collection getDependentProjects(String file_path) {
- Hashtable outProjects = new Hashtable();
- Vector in_links = (Vector) inLinksTable.get(file_path);
-
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
- // should be in the form of: /ProjName/....
- if (url.length() > 0) {
- // key could be the filename or the missing filename ("-" + filename)
- // take this into account and offset the index accordingly
- int index = 0;
- int offset = 1;
- if (url.charAt(0) == '-') {
- index = url.indexOf(IPath.SEPARATOR, 2);
- offset = 2;
- } else {
- index = url.indexOf(IPath.SEPARATOR, 1);
- offset = 1;
- }
- if (index != -1) {
- String projName = url.substring(offset, index);
- outProjects.put(projName, projName);
- }
- }
- }
- }
- return outProjects.values();
- }
-
- /*
- * returns which cross-project files depend on this file i.e. any projects that are in this
- * file's list of in_links
- */
- public Collection getDependentProjectFiles(String projName) {
- Hashtable outProjects = new Hashtable();
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- // should be in the form of: /ProjName/....
- if (path.length() > 0) {
- // if path is a missing filename ("-" + filename) then it means that it had
- // to come from this project (that is, the external nonexistent file could not have
- // linked to this project). So, we will not add this path. Also, since it is marked
- // broken, it probably won't exist to do anything with it anyway.
- if (path.charAt(0) != '-') {
- int index = path.indexOf(IPath.SEPARATOR, 1);
- if (index != -1) {
- String currentProjName = path.substring(1, index);
- if (!currentProjName.equals(projName)) {
- outProjects.put(path, path);
- }
- }
- }
- }
- }
- return outProjects.values();
- }
-
-
-
- public void createInLinkEntry(String file_path, String parent_path, int occurence) {
-
- Vector in_links = new Vector();
- Link inlnk = new Link(parent_path, occurence);
- in_links.addElement(inlnk);
- inLinksTable.put(file_path, in_links);
- }
-
-
-
- public void dump() {
- if (false) {
- if (inLinksTable != null) {
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- StringBuffer St = new StringBuffer();
- String key = (String) aenum.nextElement();
- St.append("\nKey=" + key + "\n");//$NON-NLS-1$//$NON-NLS-2$
- Vector in_links = (Vector) inLinksTable.get(key);
- int nb_of_links = in_links.size();
-
- // Replace the string by index
- // Add a '+'separator only for more than one links to save space
- //
-
-
- for (int i = 0; i < nb_of_links; i++) {
- Link lnk = (Link) in_links.elementAt(i);
- St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
- }
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logInfo(St.toString());
- }
- }
- }
- }
-
- public void dump(boolean dump) {
- if (dump) {
- if (inLinksTable != null) {
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- StringBuffer St = new StringBuffer();
- String key = (String) aenum.nextElement();
- St.append("\nKey=" + key + "\n");//$NON-NLS-1$//$NON-NLS-2$
- Vector in_links = (Vector) inLinksTable.get(key);
- int nb_of_links = in_links.size();
-
- // Replace the string by index
- // Add a '+'separator only for more than one links to save space
- //
-
-
- for (int i = 0; i < nb_of_links; i++) {
- Link lnk = (Link) in_links.elementAt(i);
- St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
- }
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(St.toString());
- }
- }
- }
- }
-
- /**
- * used for LinksBuilder debugging
- */
- public void dump2() {
- if (inLinksTable != null) {
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- StringBuffer St = new StringBuffer();
- String key = (String) aenum.nextElement();
-
- Vector in_links = (Vector) inLinksTable.get(key);
- int nb_of_links = in_links.size();
- St.append("\nKey=" + key + " -- num:" + nb_of_links + "\n");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- // Replace the string by index
- // Add a '+'separator only for more than one links to save space
- //
-
-
- for (int i = 0; i < nb_of_links; i++) {
- Link lnk = (Link) in_links.elementAt(i);
- St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
- }
- System.out.println(St.toString());
- }
- }
- System.out.println("************************************************\n\n\n\n************************************\n"); //$NON-NLS-1$
- }
-
-
- public Vector getInLinks(String filePath) {
- return (Vector) inLinksTable.get(filePath);
- }
-
- public void getInLinks(String filePath, Vector vectInLinks) {
-
- if (inLinksTable != null) {
- dump();
- Vector in_links = (Vector) inLinksTable.get(filePath);
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) ((Link) in_links.elementAt(i)).clone();
- vectInLinks.addElement(inlnk);
- }
- }
- }
- }
-
- public Hashtable getAnchorsTable() {
- return anchorsTable;
- }
-
- /**
- * Returns the file used to store ServerContextRoot for the project.
- */
- public static File getPreviousSCRFile(IProject project) {
- return new Path(J2EEPlugin.getDefault().getStateLocation().toString() + File.separator + project.getName() + File.separator + LINK_SERVERCONTEXTROOT_FILE_NAME).toFile();
- }
-
- /**
- * Returns the file used to store the state of the link relations for the project.
- *
- * @return java.io.File The state file
- * @param project
- * org.eclipse.core.resources.IProject The project to get the state file for.
- */
- private File getStateFile(IProject project) {
- return new Path(J2EEPlugin.getDefault().getStateLocation().toString() + File.separator + project.getName() + File.separator + LINK_STATE_FILE_NAME).toFile();
- }
-
- public boolean hasInLinkEntry(String path) {
- return inLinksTable.containsKey(path);
- }
-
- /**
- * Run through all missing-file (-) RD entries to see if any of them closely match the path to
- * this class. Return all of the matches.
- */
- public Vector getPossibleMissingEndingMatches(IPath classPath) {
- Vector v = new Vector();
-
- String match = classPath.lastSegment();
- match = match.substring(0, match.length() - 6); // length minus ".class"
-
- String classPathStr = classPath.toString();
- String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- // check if path ends with the class name that has been added/removed
- if (path.startsWith(LINK_MISSING_FILE) && path.endsWith(match)) {
- // OK: simple match found; now let's match with finer granularity.
- // Take path and put it into a form where we can check if it is a
- // close match to the class that has changed:
- // /Proj/Web Content/com.acme.Foo --> com/acme/Foo
- String linkPath;
- int index = path.lastIndexOf(IPath.SEPARATOR);
- if (index != -1 && index < path.length() - 1) {
- linkPath = path.substring(index + 1);
- } else {
- linkPath = path;
- }
- String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
- if (matchingClassPath.endsWith(closeMatch)) {
- Vector in_links = (Vector) inLinksTable.get(path);
- String nonMissingPath = path.substring(1, path.length());
- changeInLink(nonMissingPath, false);
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
- v.add(url);
- }
- }
- }
- }
- }
- return v;
- }
-
-
- /**
- * Run through all existing RD entries to see if any of them closely match the path to this
- * class. Return all of the matches.
- */
- public Vector getPossibleExistingEndingMatches(IPath classPath) {
- Vector v = new Vector();
-
- String match = classPath.lastSegment();
- match = match.substring(0, match.length() - 6); // length minus ".class"
-
- String classPathStr = classPath.toString();
- String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- // check if path ends with the class name that has been added/removed
- if (path.endsWith(match) && !path.startsWith(LINK_MISSING_FILE)) {
- // OK: simple match found; now let's match with finer granularity.
- // Take path and put it into a form where we can check if it is a
- // close match to the class that has changed:
- // /Proj/Web Content/com.acme.Foo --> com/acme/Foo
- String linkPath;
- int index = path.lastIndexOf(IPath.SEPARATOR);
- if (index != -1 && index < path.length() - 1) {
- linkPath = path.substring(index + 1);
- } else {
- linkPath = path;
- }
- String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
- if (matchingClassPath.endsWith(closeMatch)) {
- Vector in_links = (Vector) inLinksTable.get(path);
- changeInLink(path, true);
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
- v.add(url);
- }
- }
- }
- }
- }
- return v;
- }
-
- /**
- * Run through all existing RD entries to see if any of them closely match the path to this
- * class. Remove the inlinks for all the matches.
- */
- public void removeInLinksPossibleExistingEndingMatches(IPath classPath) {
- String match = classPath.lastSegment();
- match = match.substring(0, match.length() - 6); // length minus ".class"
-
- String classPathStr = classPath.toString();
- String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- if (path.endsWith(match) && !path.startsWith(LINK_MISSING_FILE)) {
- // OK: simple match found; now let's match with finer granularity.
- // Take path and put it into a form where we can check if it is a
- // close match to the class that has changed:
- // /Proj/Web Content/com.acme.Foo --> com/acme/Foo
- String linkPath;
- int index = path.lastIndexOf(IPath.SEPARATOR);
- if (index != -1 && index < path.length() - 1) {
- linkPath = path.substring(index + 1);
- } else {
- linkPath = path;
- }
- String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
- if (matchingClassPath.endsWith(closeMatch)) {
- removeInLinks(path);
- }
- }
- }
- }
-
- /**
- * Initialize links tables
- */
- public void initialize() {
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
- anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
-
- }
-
- /**
- * Initialize links tables
- */
- public void initializeAnchors() {
- anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
- }
-
- /**
- * Initialize links tables
- */
- public void initializeInLinks() {
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
- }
-
- /**
- * Return true if the file to restore data from existed and was successfully read.
- *
- * @return boolean
- */
- public boolean isFileOk() {
- return fileOk;
- }
-
- public boolean isInitialized() {
- return (inLinksTable != null);
- }
-
- public void newInLinkEntry(String path) {
- if (!inLinksTable.containsKey(path))
- inLinksTable.put(path, new Vector());
- }
-
- public void removeInLinks(String file_path) {
-
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- in_links.removeElementAt(i);
- break;
- }
-
- //
- // Remove the entry in the fLinksTable if the in-link
- // of the file is not in the workbench and an orphan link
- // otherwise update the in-links fLinksTable
- //
- }
-
- if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE)) {
- inLinksTable.remove(key);
- }
- }
- }
-
- /**
- * Iterate through the fLinksTable to return all out-links references for file_path
- *
- * @param file_path
- * @return
- */
- public List getOutLinks(String file_path) {
- ArrayList list = new ArrayList();
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- list.add(key);
- break;
- }
- }
- }
-
- return list;
- }
-
-
- /**
- * return whether other resources link to this file or not
- */
- public boolean referencedByOtherLinks(String file_path) {
-
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
- boolean referenced = false;
- for (Enumeration aenum = inLinksTable.keys(); !referenced && aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- referenced = true;
- break;
- }
- }
- }
- return referenced;
- }
-
-
- /*
- * performs as removeInLinks( String ) ... But for performance reasons, this also additionally
- * returns a list of all the projects that this file is dependent upon. This is useful to get
- * this information, and then go to all of those projects' relation data and tell them to
- * removeInLinks for this file.
- */
- public Collection removeInLinksForProjects(String file_path) {
-
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
- Hashtable projects = new Hashtable();
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- // should be in the form of: /ProjName/....
- if (key.length() > 0) {
- // key could be the filename or the missing filename ("-" + filename)
- // take this into account and offset the index accordingly
- int index = 0;
- int offset = 1;
- if (key.charAt(0) == '-') {
- index = key.indexOf(IPath.SEPARATOR, 2);
- offset = 2;
- } else {
- index = key.indexOf(IPath.SEPARATOR, 1);
- offset = 1;
- }
- if (index != -1) {
- String projName = key.substring(offset, index);
- projects.put(projName, projName);
- }
- }
- in_links.removeElementAt(i);
- break;
- }
-
- //
- // Remove the entry in the fLinksTable if the in-link
- // of the file is not in the workbench and an orphan link
- // otherwise update the in-links fLinksTable
- //
- }
-
- if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE))
- inLinksTable.remove(key);
- }
-
- return projects.values();
- }
-
-
-
- /**
- * performs as removeInLinks( String ) ... But for performance reasons, it additionally returns
- * which projects depend on this file. i.e. any projects that are in this file's list of
- * in_links
- */
- public Collection removeInLinksAndGetDependentProjects(String file_path) {
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
- Hashtable projects = new Hashtable();
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- if (key.equals(RelationData.LINK_MISSING_FILE + file_path)) {
- int index = -1;
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- index = i;
- }
- if (url.length() > 1) {
- int projindex = url.indexOf(IPath.SEPARATOR, 1);
- if (projindex != -1) {
- String projName = url.substring(1, projindex);
- projects.put(projName, projName);
- }
- }
- }
- if (index != -1) {
- in_links.removeElementAt(index);
- }
-
- } else {
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
-
- in_links.removeElementAt(i);
- break;
- }
-
- //
- // Remove the entry in the fLinksTable if the in-link
- // of the file is not in the workbench and an orphan link
- // otherwise update the in-links fLinksTable
- //
- }
- }
-
- if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE)) {
- inLinksTable.remove(key);
- }
- }
- return projects.values();
- }
-
-
- /**
- * remove all references to a specific inLink. When removeOrphan is true the inLink entry is
- * removed as well, when there are no more refereces to it
- */
- public void removeInLinks(String inLinkEntry, String inLinkReference, boolean removeOrphan) {
-
- String key = inLinkEntry;
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(inLinkReference) == 0) {
- in_links.removeElementAt(i);
- break;
- }
- }
-
- // If there are no more references to the inLinkEntry
- // and the caller wants this orphan deleted then
- // remove the key from the table
- if (in_links.isEmpty() && removeOrphan)
- inLinksTable.remove(key);
-
- }
-
- /**
- * Restores this builder's saved state and returns whether it was successful in doing so.
- */
- public boolean restore(IProject project) {
- if (project != null) {
- // get the state
- File stateFile = getStateFile(project);
- if (stateFile.exists()) {
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
-
- // read inLinksTable from stateFile
- Vector keys = new Vector();
- Vector indices = new Vector();
- BufferedReader reader = null;
- try {
- reader = new BufferedReader(new FileReader(stateFile));
-
- String line = null;
- // while( ((line = reader.readLine()) != null) && !line.startsWith(
- // ANCHOR_SEPARATOR ) )
- while ((line = reader.readLine()) != null) {
- String buffer = line;
-
-
- // to take into account the possibility of links spanning multiple lines,
- // keep reading until we find a line that starts with an idicator
- // that the link is finished (a line beginning w/ LINK_INDEX_SEPARATOR)
- line = reader.readLine();
- while (line != null && !line.startsWith(LINK_INDEX_SEPARATOR)) {
- buffer = buffer + line;
- line = reader.readLine();
- }
- // add link string (/MyProj/file.html)
- if (buffer != null) {
- keys.addElement(buffer);
- }
- // add references line (+2/3...)
- if (line != null) {
- indices.addElement(line);
- } else {
- System.out.println(ProjectSupportResourceHandler.Syntax_Error_in_the_links_UI_); //$NON-NLS-1$ = "Syntax Error in the links state file"
- return false;
- }
- }
-
- // Use this to load anchor information
- // // Now let's add all of the extra anchor information
- // if ( line != null && line.startsWith( ANCHOR_SEPARATOR ) ) {
- // while( (line = reader.readLine()) != null )
- // {
- // String buffer = line;
- //
- // // to take into account the possibility of links spanning multiple lines,
- // // keep reading until we find a line that starts with an idicator
- // // that the link is finished (a line beginning w/ LINK_INDEX_SEPARATOR)
- // line = reader.readLine();
- // while ( line != null && !line.startsWith( ANCHOR_INDEX_SEPARATOR ) ) {
- // buffer = buffer + line;
- // line = reader.readLine();
- // }
- //
- // // add file and all of its anchors
- // if ( buffer != null && line != null)
- // {
- // anchorsTable.put( buffer, line );
- // }
- // else
- // {
- // System.out.println(ResourceHandler.getString("Syntax_Error_in_the_links_UI_"));
- // //$NON-NLS-1$ = "Syntax Error in the links state file"
- // return false;
- // }
- // }
- //
- // }
- } catch (FileNotFoundException fe) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(fe);
- } catch (IOException ie) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ie);
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException ie2) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ie2);
- }
- }
- }
-
-
- //
- // Populate the hash inLinksTable with keys (file paths) and values (in links files
- // paths)
- //
- fileOk = true;
- for (int i = 0; i < keys.size(); i++) {
- try {
- String key = (String) keys.elementAt(i);
- String compacted_indices = (String) indices.elementAt(i);
-
- //
- // Parse the in-links indexes
- //
-
- int size = keys.size();
- Vector in_links = new Vector();
- if (compacted_indices != LINK_INDEX_SEPARATOR) {
-
- // Extract indexes and occurences
-
- StringTokenizer st_idx_occ = new StringTokenizer(new String(compacted_indices), LINK_INDEX_SEPARATOR);
- while (st_idx_occ.hasMoreTokens()) {
- String idx_occ = new String(st_idx_occ.nextToken());
- int pos_occ = idx_occ.indexOf(LINK_OCCURENCE_SEPARATOR);
- int index;
- int occurence = 1;
- if (pos_occ == -1) {
- index = Integer.valueOf(idx_occ).intValue();
- } else {
- index = Integer.valueOf(idx_occ.substring(0, pos_occ)).intValue();
- occurence = Integer.valueOf(idx_occ.substring(pos_occ + 1)).intValue();
- }
- if (index >= 0 && index < size) {
- Link inlnk = new Link((String) keys.elementAt(index), occurence);
- in_links.addElement(inlnk);
- }
- }
- }
- inLinksTable.put(key, in_links);
- } catch (Exception e) {
- fileOk = false;
- }
- }
-
- return fileOk;
- }
- return false;
-
- }
-
- return false;
- }
-
- /**
- * Saves this builder's state to disk so that it can be restarted in the same state later.
- */
- public void save(IProject project) {
-
- File stateFile = getStateFile(project);
- if (inLinksTable == null) {
- stateFile.delete();
- } else {
-
- // Prepare the index vector
-
- Vector index_vector = new Vector(inLinksTable.size());
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- index_vector.addElement(aenum.nextElement());
- }
-
- // write inLinksTable to stateFile
-
- try {
- File parentFolder = stateFile.getParentFile();
- if (!parentFolder.exists()) {
- parentFolder.mkdirs();
- }
- PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(stateFile)));
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- out.print(key);
- out.println();
- out.print(LINK_INDEX_SEPARATOR);
- Vector in_links = (Vector) inLinksTable.get(key);
- int nb_of_links = in_links.size();
-
- // Replace the string by index
- // Add a '+'separator only for more than one links to save space
- // Add '/<occurence>' only if occurence > 1 to save space
- //
-
- Link lnk = null;
- int nb_lnks = 0;
- if (nb_of_links > 0) {
- lnk = (Link) in_links.elementAt(0);
- out.print(index_vector.indexOf(lnk.getURL()));
- nb_lnks = lnk.getOccurrences();
- if (nb_lnks > 1) {
- out.print(LINK_OCCURENCE_SEPARATOR);
- out.print(nb_lnks);
- }
- for (int i = 1; i < nb_of_links; i++) {
- out.print(LINK_INDEX_SEPARATOR);
- lnk = (Link) in_links.elementAt(i);
- out.print(index_vector.indexOf(lnk.getURL()));
- nb_lnks = lnk.getOccurrences();
- if (nb_lnks > 1) {
- out.print(LINK_OCCURENCE_SEPARATOR);
- out.print(nb_lnks);
- }
- }
- }
- out.println();
- }
- /*
- * use this to save out anchor information //
- * ############################################ if ( !anchorsTable.isEmpty() ) {
- * out.println( ANCHOR_SEPARATOR ); } for (Enumeration enum = anchorsTable.keys();
- * enum.hasMoreElements();) { String key = (String) enum.nextElement();
- * out.print(key); out.println(); //out.print(ANCHOR_INDEX_SEPARATOR); out.println(
- * anchorsTable.get(key) ); }
- */
-
- out.flush();
- out.close();
- } catch (IOException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ProjectSupportResourceHandler.Error_while_saving_links_s_EXC_); //$NON-NLS-1$ = "Error while saving links state file"
- }
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (3/21/2001 1:45:58 PM)
- *
- * @param newFileOk
- * boolean
- */
- void setFileOk(boolean newFileOk) {
- fileOk = newFileOk;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java
deleted file mode 100644
index 5003dc6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java
+++ /dev/null
@@ -1,133 +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
- *******************************************************************************/
-/*
- * Created on Sep 12, 2003
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * A class with some useful methods that support server targetting for Web projects.
- *
- * @author Pratik Shah
- */
-public class ServerTargetUtil {
-
- private static final String defaultId = "com.ibm.etools.websphere.serverTarget.base.v51"; //$NON-NLS-1$
- private static final String defaultExpressId = "com.ibm.etools.websphere.serverTarget.express.v51"; //$NON-NLS-1$
-
- /**
- * @param targets
- * A list of IServerTargets
- * @return The index of the target server with the
- * {@link #getDefaultServerTargetId() default Id}; or 0, if it could not be found.
- */
- public static int findDefaultServerTargetIndex(List targets) {
- int index = 0;
- for (int i = 0; i < targets.size(); i++) {
- IRuntime target = (IRuntime) targets.get(i);
- if (target.getId().equals(getDefaultServerTargetId())) {
- index = i;
- break;
- }
- }
- return index;
- }
-
- /**
- * @param target
- * The IServerTarget that has to be found in the given list; it can be
- * <code>null</code>
- * @param list
- * The List from which the IServerTarget has to be found
- *
- * @return The index of the given target in the given list; or 0, if the given target could not
- * be found in the given list. Two IServerTargets are considered to be equal if they
- * have the same ID.
- */
- public static int findIndexOf(IRuntime target, List list) {
- int index = 0;
- if (target != null) {
- for (int i = 0; i < list.size(); i++) {
- IRuntime element = (IRuntime) list.get(i);
- if (element.equals(target)) {
- index = i;
- break;
- }
- }
- }
- return index;
- }
-
- /**
- * @return the Id of the target server that should be selected by default
- */
- public static String getDefaultServerTargetId() {
- String id = defaultExpressId;
- if (J2EEPlugin.isEJBSupportAvailable()) {
- id = defaultId;
- }
- return id;
- }
-
- /**
- * @param isJ2EE13
- * <code>true</code> if the constant for J2EE version 1.3 is desired
- * @return IServerTargetConstants.J2EE_12 or IServerTargetConstants.J2EE_13
- */
- public static String getJ2EEVersion(boolean isJ2EE13) {
- return isJ2EE13 ? IServerTargetConstants.J2EE_13 : IServerTargetConstants.J2EE_12;
- }
-
- /**
- * A convenient method that takes in a list of IServerTargets and returns an array of labels of
- * the IServerTargets in the given list.
- *
- * @param serverTargets
- * The list of IServerTargets
- * @return An array lof labels of the IServerTargets in the given list
- */
- public static String[] getServerNames(List serverTargets) {
- String[] result = new String[serverTargets.size()];
- for (int i = 0; i < result.length; i++) {
- IRuntime runtime = (IRuntime) serverTargets.get(i);
- result[i] = runtime.getName() + " (" + runtime.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- return result;
- }
-
- /**
- * @param prjName
- * name of the project whose ServerTarget has to be retrieved; it can be
- * <code>null</code>
- *
- * @return the ServerTarget of the given project; <code>null</code> if the project does not
- * exist or its ServerTarget is not specified.
- */
- public static IRuntime getServerTarget(String prjName) {
- if (prjName != null && !prjName.trim().equals("")) { //$NON-NLS-1$
- IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
- if (prj != null && prj.exists()) {
- return ServerCore.getProjectProperties(prj).getRuntimeTarget();
- }
- }
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java
deleted file mode 100644
index 092e800..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java
+++ /dev/null
@@ -1,94 +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.jst.j2ee.internal.web.operations;
-
-
-
-public class TemplateData {
- protected java.lang.String wtFileName = "";//$NON-NLS-1$
- protected java.lang.String wtCSSName = "";//$NON-NLS-1$
- protected java.lang.String wtContainerLocatoin = "";//$NON-NLS-1$
- protected java.lang.String taglibs;
-
- /**
- * TemplateData constructor comment.
- */
- public TemplateData() {
- super();
- }
-
- /**
- */
- public String getContainerLocatoin() {
- return wtContainerLocatoin;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:24:30 PM)
- *
- * @return java.lang.String
- */
- public java.lang.String getCSSName() {
- return wtCSSName;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:22:56 PM)
- *
- * @return java.lang.String
- */
- public String getFileName() {
- return wtFileName;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/15/2001 4:16:10 PM)
- *
- * @return java.lang.String
- */
- public java.lang.String getTaglibs() {
- return taglibs;
- }
-
- /**
- */
- public void setContainerLocatoin(String newFileName) {
- wtContainerLocatoin = newFileName;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:24:30 PM)
- *
- * @param newCSSName
- * java.lang.String
- */
- public void setCSSName(java.lang.String newCSSName) {
- wtCSSName = newCSSName;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:22:56 PM)
- *
- * @param newWtFileName
- * java.lang.String
- */
- public void setFileName(String newFileName) {
- wtFileName = newFileName;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/15/2001 4:16:10 PM)
- *
- * @param newTaglibs
- * java.lang.String
- */
- public void setTaglibs(java.lang.String newTaglibs) {
- taglibs = newTaglibs;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
deleted file mode 100644
index 15e5373..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
+++ /dev/null
@@ -1,580 +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.jst.j2ee.internal.web.operations;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-public class WebPropertiesUtil {
- // private static final char[] BAD_CHARS = {'/', '\\', ':'};
- private static final char[] BAD_CHARS = {':'};
- public static final String DEFAULT_JAVA_SOURCE_NAME = "Java Source"; //$NON-NLS-1$
- //TODO Port to flexible structure
- /**
- * Update the Web Content folder to a new value if it is different. This applies to both Static
- * and J2EE Web Projects. In the case of a J2EE Project, the library classpath entries will be
- * modifies to reflect the new location.
- *
- * @param project
- * The Web Project to update
- * @param webContentName
- * The new name given to the Web Project's Web Content folder
- * @param progressMonitor
- * Indicates progress of the update operation
- * @return True if the web content rename was actually renamed, false if unneeded.
- * @throws CoreException
- * The exception that occured during renaming of the the project's web content
- * folder
- */
- public static boolean updateWebContentNameAndProperties(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
- boolean success = false;
- if (project.exists() && project.isOpen()) {
-
- /*
- * IBaseWebNature webNature = J2EEWebNatureRuntimeUtilities.getRuntime(project); if
- * (webContentName == null) { if (webNature.isStatic()) { webContentName =
- * J2EEWebNatureRuntimeUtilities.getDefaultStaticWebContentName(); } else {
- * webContentName = J2EEWebNatureRuntimeUtilities.getDefaultJ2EEWebContentName(); } }
- */
-
- IPath newPath = new Path(webContentName);
- if (getModuleServerRoot(project).getProjectRelativePath().equals(newPath))
- return false;
- if (project.exists(newPath)) {
- IStatus status = new Status(IStatus.ERROR, "org.eclipse.jst.j2ee", IStatus.OK, ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Could_not_rename_____2, new Object[]{webContentName}), null); //$NON-NLS-1$ //$NON-NLS-2$
- throw new CoreException(status);
- }
-
- moveWebContentFolder(project, webContentName, progressMonitor);
- updateWebContentNamePropertiesOnly(project, webContentName, progressMonitor);
- success = true;
- }
- return success;
- }
-
- /**
- * Update the classpath entries and Server Root Name for this web project only.
- *
- * @param project
- * @param webContentName
- * @return
- */
- public static void updateWebContentNamePropertiesOnly(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
- IPath newPath = new Path(webContentName);
- if (getModuleServerRoot(project).equals(newPath))
- return;
-
- if (!getModuleServerRoot(project).equals(webContentName)) {
-
- // if (webModuleArtifact.isJ2EE) {
- // Update the library references
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- IClasspathEntry[] newClasspath = new IClasspathEntry[classpath.length];
-
- for (int i = 0; i < classpath.length; i++) {
- if (classpath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- IClasspathEntry library = classpath[i];
- IPath libpath = library.getPath();
- IPath modServerRootPath = getModuleServerRoot(project).getFullPath();
- if (modServerRootPath.isPrefixOf(libpath)) {
- IPath prunedPath = libpath.removeFirstSegments(modServerRootPath.segmentCount());
- IPath relWebContentPath = new Path(webContentName + "/" + prunedPath.toString()); //$NON-NLS-1$
- IResource absWebContentPath = project.getFile(relWebContentPath);
-
- IPath srcAttachmentPath = library.getSourceAttachmentPath();
- if (null != srcAttachmentPath) {
- prunedPath = srcAttachmentPath.removeFirstSegments(modServerRootPath.segmentCount());
- }
- IResource absWebContentSrcAttachmentPath = project.getFile(relWebContentPath);
-
- newClasspath[i] = JavaCore.newLibraryEntry(absWebContentPath.getFullPath(), absWebContentSrcAttachmentPath.getFullPath(), library.getSourceAttachmentRootPath(), library.isExported());
-
- } else {
- newClasspath[i] = classpath[i];
- }
-
- } else {
- newClasspath[i] = classpath[i];
- }
- // }
-
- // Set the java output folder
- IFolder outputFolder = project.getFolder(getModuleServerRoot(project).getFullPath());
- javaProject.setRawClasspath(newClasspath, outputFolder.getFullPath(), new SubProgressMonitor(progressMonitor, 1));
- }
- // update websettings
- // TODO add to WebArtifactEdit
- // webNature.setModuleServerRootName(webContentName);
- }
- }
-
- /**
- * Moves the web content folder to the name indicated only if that path doesn't already exist in
- * the project.
- *
- * @param project
- * The web project to be updated.
- * @param webContentName
- * The new web content name
- * @param progressMonitor
- * Indicates progress
- * @throws CoreException
- * The exception that occured during move operation
- */
- public static void moveWebContentFolder(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
- IPath newPath = new Path(webContentName);
- if (!project.exists(newPath)) {
- if (newPath.segmentCount() > 1) {
- for (int i = newPath.segmentCount() - 1; i > 0; i--) {
- IPath tempPath = newPath.removeLastSegments(i);
- IFolder tempFolder = project.getFolder(tempPath);
- if (!tempFolder.exists()) {
- tempFolder.create(true, true, null);
- }
- }
- }
- newPath = project.getFullPath().append(newPath);
- IContainer webContentRoot = getModuleServerRoot(project);
- IPath oldPath = webContentRoot.getProjectRelativePath();
- webContentRoot.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
- for (int i = 0; i < oldPath.segmentCount(); i++) {
- IPath tempPath = oldPath.removeLastSegments(i);
- IFolder tempFolder = project.getFolder(tempPath);
- if (tempFolder.exists() && tempFolder.members().length == 0) {
- tempFolder.delete(true, true, null);
- }
- }
- }
- }
-
- /**
- * Synchonizies the class path and the lib directories to catch any changes from the last use
- * Creation date: (4/17/01 11:48:12 AM)
- */
- protected static void synch(IProject project, IProgressMonitor monitor) {
-
- try {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask(ProjectSupportResourceHandler.Sychronize_Class_Path_UI_, 4); //$NON-NLS-1$
- //$NON-NLS-1$ = "Sychronize Class Path"
-
- IContainer lib_folder = getWebLibFolder(project);
- // Nothing to do if the lib folder does not exist.
- if (lib_folder == null || !lib_folder.isAccessible())
- return;
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- IPath lib_path = lib_folder.getProjectRelativePath();
- IPath lib_full_path = lib_folder.getFullPath();
-
- IClasspathEntry[] cp = javaProject.getRawClasspath();
-
- boolean needsToBeModified = false;
- // Create a map of the lib projects in the current project
- Hashtable lib_jars = new Hashtable();
- IResource[] children = lib_folder.members();
- monitor.subTask(ProjectSupportResourceHandler.Catalog_Lib_Directory__UI_); //$NON-NLS-1$
- //$NON-NLS-1$ = "Catalog Lib Directory:"
- for (int j = 0; j < children.length; j++) {
- IResource child = children[j];
- // monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory__UI_") +
- // child); //$NON-NLS-1$ = "Catalog Lib Directory:"
- // Make sure it is a zip or a jar file
- if (child.getType() == IResource.FILE && (child.getFullPath().toString().toLowerCase().endsWith(".jar") //$NON-NLS-1$
- || child.getFullPath().toString().toLowerCase().endsWith(".zip"))) { //$NON-NLS-1$
- lib_jars.put(child.getFullPath(), child);
- }
-
- }
-
- monitor.worked(1);
- monitor.subTask(ProjectSupportResourceHandler.Update_ClassPath__UI_); //$NON-NLS-1$
- //$NON-NLS-1$ = "Update ClassPath:"
- // Loop through all the classpath dirs looking for ones that may have
- // been deleted
- Vector newClassPathVector = new Vector();
- for (int j = 0; j < cp.length; j++) {
-
- // If it is a lib_path
- if (cp[j].getPath().toString().startsWith(lib_path.toString()) || cp[j].getPath().toString().startsWith(lib_full_path.toString())) {
- // It was already in the class path
- if (lib_jars.get(cp[j].getPath()) != null) {
- newClassPathVector.add(cp[j]);
- // Remove it from the hash table of paths to add back
- // monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory__UI_")
- // + cp[j].getPath()); //$NON-NLS-1$ = "Catalog Lib Directory:"
- lib_jars.remove(cp[j].getPath());
-
- } else {
- // You have removed something form the class path you
- // will need to re-build
- // monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory_Remo_UI_")
- // + cp[j].getPath()); //$NON-NLS-1$ = "Catalog Lib Directory:Remove "
- needsToBeModified = true;
- }
- } else {
- monitor.subTask(ProjectSupportResourceHandler.Catalog_Lib_Directory__UI_ + cp[j].getPath()); //$NON-NLS-1$
- //$NON-NLS-1$ = "Catalog Lib Directory:"
- newClassPathVector.add(cp[j]);
- }
- }
- monitor.worked(1);
- monitor.subTask(ProjectSupportResourceHandler.Update_ClassPath__UI_); //$NON-NLS-1$
- //$NON-NLS-1$ = "Update ClassPath:"
-
- // Add any entries not already found
- Enumeration aenum = lib_jars.keys();
- while (aenum.hasMoreElements()) {
- IPath path = (IPath) aenum.nextElement();
- newClassPathVector.add(JavaCore.newLibraryEntry(path, null, null));
- // You have added something form the class path you
- // will need to re-build
- // monitor.setTaskName(ResourceHandler.getString("23concat_UI_", (new Object[] {
- // path }))); //$NON-NLS-1$ = "Catalog Lib Directory:Add {0}"
- needsToBeModified = true;
- }
-
- monitor.worked(1);
- monitor.subTask(ProjectSupportResourceHandler.Set_ClassPath__UI_); //$NON-NLS-1$
- //$NON-NLS-1$ = "Set ClassPath:"
-
- // Tansfer the vector to an array
- IClasspathEntry[] newClassPathArray = new IClasspathEntry[newClassPathVector.size()];
-
- for (int j = 0; j < newClassPathArray.length; j++) {
- newClassPathArray[j] = (IClasspathEntry) newClassPathVector.get(j);
- }
-
- // Only change the class path if there has been a modification
- if (needsToBeModified) {
-
- try {
- javaProject.setRawClasspath(newClassPathArray, monitor);
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- }
-
- } catch (ClassCastException ex) {
- Logger.getLogger().log(ex);
- } catch (CoreException ex) {
- Logger.getLogger().log(ex);
- } finally {
- monitor.done();
- }
- }
-
- public static void updateContextRoot(IProject project, String contextRoot) {
- if (project.exists() && project.isOpen()) {
- WebArtifactEdit webEdit = null;
- try {
- // TODO migrate to flex projects
- // webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead(project);
- if (webEdit != null)
- webEdit.setServerContextRoot(contextRoot);
- } finally {
- if (webEdit != null)
- webEdit.dispose();
- }
-
- }
- }
-
-
- /**
- * @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("") || name == null) { //$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 = ProjectSupportResourceHandler.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 = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.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 = ProjectSupportResourceHandler.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 ProjectSupportResourceHandler.Folder_name_cannot_be_empty_2; //$NON-NLS-1$
-
- if (contains(folderName, BAD_CHARS))
- return ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Folder_name_is_not_valid, new Object[]{folderName}); //$NON-NLS-1$
-
- return null;
- }
-
-
- public static String validateWebContentName(String webContentName, IProject project, String javaSourceName) {
-
- String msg = validateFolderName(webContentName);
- if (msg != null)
- return msg;
-
- if (javaSourceName != null && webContentName.equals(javaSourceName))
- return ProjectSupportResourceHandler.Folder_names_cannot_be_equal_4; //$NON-NLS-1$
-
- // If given a java project, check to make sure current package fragment
- // root folders do not overlap with new web content name
- if (project != null) {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- if (javaProject != null) {
- try {
- IPackageFragmentRoot roots[] = javaProject.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- if (!root.isArchive()) {
- IResource resource = root.getCorrespondingResource();
- if (resource.getType() == IResource.FOLDER) {
- IPath path = resource.getFullPath();
- String rootFolder = path.segment(1);
- if (webContentName.equals(rootFolder)) {
- if (root.getKind() == IPackageFragmentRoot.K_SOURCE)
- return ProjectSupportResourceHandler.Folder_name_cannot_be_the_same_as_Java_source_folder_5; //$NON-NLS-1$
-
- return ProjectSupportResourceHandler.Folder_name_cannot_be_the_same_as_Java_class_folder_6; //$NON-NLS-1$
- }
- }
- }
- }
- } catch (JavaModelException e) {
- return null;
- }
- }
- }
-
- return null;
- }
-
-
- /**
- * Update given web nature to the current version if necessary.
- *
- * @param webNature
- * The web Nature that should be examined.
- * @return True if successful, false if unnecessary.
- * @throws CoreException
- * The exception that occured during the version change operation.
- */
- /*
- * static public boolean updateNatureToCurrentVersion(J2EEWebNatureRuntime webNature) throws
- * CoreException {
- *
- * boolean success = false;
- *
- * if (webNature.getVersion() != WEB.CURRENT_VERSION) {
- * webNature.setVersion(J2EESettings.CURRENT_VERSION); success = true; }
- * ((J2EEModuleWorkbenchURIConverterImpl)
- * webNature.getResourceSet().getURIConverter()).recomputeContainersIfNecessary();
- *
- * return success; }
- */
-
- /**
- * Move the old source folder to the new default folder.
- *
- * @param project
- * The Web Project we are working with.
- * @param oldSourceFolder
- * The old "Java Source" folder that will be moved.
- * @param javaSourceName
- * The new name of the "Java Source" folder, or null for default.
- * @return The location of the new folder, or null if no move was necessary.
- * @throws CoreException
- * The exception that occured during the move operation.
- */
- static public IContainer updateJavaSourceName(IProject project, IContainer oldSourceFolder, String javaSourceName, IProgressMonitor progressMonitor) throws CoreException {
- IContainer newSourceFolder = null;
- if (oldSourceFolder != null) {
- IPath newPath;
- if (javaSourceName == null)
- newPath = new Path(DEFAULT_JAVA_SOURCE_NAME);
- else
- newPath = new Path(javaSourceName);
-
- // Make sure new path is different form old path
- if (!project.getFolder(newPath).getFullPath().equals(oldSourceFolder.getFullPath())) {
- oldSourceFolder.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
- JemProjectUtilities.removeFromJavaClassPath(project, oldSourceFolder);
- newSourceFolder = project.getFolder(newPath);
- JemProjectUtilities.appendJavaClassPath(project, JavaCore.newSourceEntry(project.getFolder(newPath).getFullPath()));
- }
- }
- return newSourceFolder;
- }
-
-
- /**
- * Get the source folder that should be used for migration.
- *
- * @param project
- * The Web Project to examine.
- * @return The source folder to use in migration, or null if it should be skipped.
- */
- static public IContainer getJavaSourceFolder(IProject project) {
- List sourceRoots = JemProjectUtilities.getSourceContainers(project);
- IContainer oldSourceFolder = null;
-
- if (sourceRoots != null) {
- if (sourceRoots.size() == 1) {
- IContainer sourceFolder = (IContainer) sourceRoots.get(0);
- if (sourceFolder instanceof IFolder) {
- oldSourceFolder = sourceFolder;
- }
- }
- }
- return oldSourceFolder;
- }
-
- public static IFolder getModuleServerRoot(IProject project) {
- // TODO need to implement module server root properly
- return project.getFolder("WebContent");
- }
-
- public static IVirtualFolder getWebLibFolder(IVirtualComponent webComponent) {
- IPath path = new Path(J2EEConstants.WEB_INF + "/" + "lib");
- IVirtualFolder libFolder = webComponent.getRootFolder().getFolder(path);
- return libFolder;
- }
-
- //TODO delete jsholl
- /**
- * @deprecated use getWebLibFolder(IVirtualComponent webComponent)
- * @param project
- * @return
- */
- public static IContainer getWebLibFolder(IProject project) {
- return getWebLibFolder(ComponentCore.createComponent(project)).getUnderlyingFolder();
- }
-
- //
- // static public boolean isImportedClassesJARFileInLibDir(IResource resource) {
- // if (resource == null || !resource.exists())
- // return false;
- // return resource.getType() == resource.FILE &&
- // resource.getName().endsWith(IWebNatureConstants.IMPORTED_CLASSES_SUFFIX) && isZip(resource);
- // }
- //
- // static public boolean isLibDirJARFile(IResource resource) {
- // if (resource == null || !resource.exists())
- // return false;
- // return resource.getType() == resource.FILE && isZip(resource);
- // }
- //
- // static public boolean isZip(IResource resource) {
- // String path = resource.getLocation().toOSString();
- // ZipFile zip = null;
- //
- // try {
- // zip = new ZipFile(path);
- // } catch (IOException notAZip) {
- // return false;
- // } finally {
- // if (zip != null) {
- // try {
- // zip.close();
- // } catch (IOException ex) {}
- // }
- // }
- // return zip != null;
- // }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java
deleted file mode 100644
index b6df10b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java
+++ /dev/null
@@ -1,98 +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.jst.j2ee.internal.web.operations;
-
-
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.JavaModelException;
-import org.xml.sax.SAXException;
-
-
-/**
- * The WebToolingException class is the generic class for exceptions generated by the web tooling.
- */
-public class WebToolingException extends Exception {
- public static final String SAX_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_SA_ERROR_; //$NON-NLS-1$ = "Operation failed due to SAX error: "
- public static final String IO_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_IO_ERROR_; //$NON-NLS-1$ = "Operation failed due to IO error: "
- public static final String CORE_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_Co_ERROR_; //$NON-NLS-1$ = "Operation failed due to Core error: "
- public static final String JAVA_MODEL_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_Ja_ERROR_; //$NON-NLS-1$ = "Operation failed due to Java Model error: "
-
- /**
- * Create a new WebToolingException with no message.
- */
- public WebToolingException() {
- super();
- }
-
- /**
- * Create a new instance of the receiver for a supplied IO Exception
- *
- * @param message
- * java.lang.String
- */
- public WebToolingException(IOException exception) {
- this(IO_ERROR_MESSAGE, exception);
- }
-
- /**
- * Create a new WebToolingException with error message of s.
- *
- * @param s
- * java.lang.String
- */
- public WebToolingException(String s) {
- super(s);
- }
-
- /**
- * Create a new instance of the receiver with the supplied preamble and the message of the
- * example appended to the end.
- *
- * @param message
- * java.lang.String
- */
- public WebToolingException(String preamble, Throwable exception) {
- this(preamble + exception.getMessage());
- }
-
- /**
- * Create a new instance of the receiver for a supplied CoreException
- *
- * @param exception
- * CoreException
- */
- public WebToolingException(CoreException exception) {
- this(CORE_ERROR_MESSAGE, exception);
- }
-
- /**
- * Create a new instance of the receiver for a supplied JavaModelException.
- *
- * @param exception
- * JavaModelException
- */
- public WebToolingException(JavaModelException exception) {
- this(JAVA_MODEL_ERROR_MESSAGE, exception);
- }
-
- /**
- * Create a new instance of the receiver for a supplied SAX Exception
- *
- * @param exception
- * SAXException
- */
- public WebToolingException(SAXException exception) {
- this(SAX_ERROR_MESSAGE, exception);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java
deleted file mode 100644
index 7c9f607..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java
+++ /dev/null
@@ -1,19 +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.jst.j2ee.internal.web.operations;
-
-public interface WebToolingTemplate {
- /**
- * Insert the method's description here. Creation date: (12/6/2000 7:35:38 PM)
- *
- * @param data
- * TemplateData
- */
- public String generate(TemplateData data);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java
deleted file mode 100644
index be022f8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.web.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class WebArtifactEditUtilities {
-
- public static IVirtualComponent getWebComponent(Servlet servlet) {
- IProject project = ProjectUtilities.getProject(servlet);
- IVirtualComponent component = ComponentCore.createComponent(project);
- WebArtifactEdit edit = null;
- try {
- if (J2EEProjectUtilities.isDynamicWebProject(project)) {
- edit = WebArtifactEdit.getWebArtifactEditForRead(component);
- WebApp webapp = edit.getWebApp();
- if (webapp.getServletNamed(servlet.getServletName()) != null)
- return component;
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java
deleted file mode 100644
index d954a9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java
+++ /dev/null
@@ -1,51 +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.jst.j2ee.internal.web.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-
-/**
- * <p>
- * Adapts {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}s to
- * {@see org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit} facades.
- * </p>
- */
-public class WebEditAdapterFactory implements IAdapterFactory {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == WebArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
- ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
- if (J2EEProjectUtilities.isDynamicWebProject(editModel.getProject()))
- return new WebArtifactEdit((ArtifactEditModel) adaptableObject);
- }
- return null;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{ArtifactEdit.class, WebArtifactEdit.class};
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
deleted file mode 100644
index 025ac7b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
+++ /dev/null
@@ -1,599 +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.jst.j2ee.web.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-
-
-/**
- * <p>
- * WebArtifactEdit obtains a Web Deployment Descriptor metamodel specifec data from a
- * {@see org.eclipse.jst.j2ee.webapplication.WebAppResource} which stores the metamodel. The
- * {@see org.eclipse.jst.j2ee.webapplication.WebAppResource} is retrieved from the
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using a constant {@see
- * J2EEConstants#WEBAPP_DD_URI_OBJ}. The defined methods extract data or manipulate the contents of
- * the underlying resource.
- * </p>
- *
- */
-public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory{
-
- /**
- * <p>
- * Identifier used to link WebArtifactEdit to a WebEditAdapterFactory {@see
- * WebEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
- public static final Class ADAPTER_TYPE = WebArtifactEdit.class;
- public static final String WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- public static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
- public static final String META_INF = "META-INF"; //$NON-NLS-1$
-
- public static IPath WEBLIB = new Path("/WEB-INF/lib"); //$NON-NLS-1$
-
- /**
- *
- */
- public WebArtifactEdit() {
- super();
- // TODO Auto-generated constructor stub
- }
-
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.DYNAMIC_WEB);
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- protected WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate, String editModelID) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, editModelID);
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static WebArtifactEdit getWebArtifactEditForRead(IProject aProject) {
- WebArtifactEdit artifactEdit = null;
- try {
- if (isValidWebModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new WebArtifactEdit(aProject, true, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static WebArtifactEdit getWebArtifactEditForWrite(IProject aProject) {
- WebArtifactEdit artifactEdit = null;
- try {
- if (isValidWebModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new WebArtifactEdit(aProject, false, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WebArtifactEdit facade for a specific {@see WorkbenchComponent} that will not
- * be used for editing. Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of WebArtifactEdit that may only be used to read the underlying content
- * model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static WebArtifactEdit getWebArtifactEditForRead(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getWebArtifactEditForRead(aModule.getProject());
- }
-
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WebArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of WebArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static WebArtifactEdit getWebArtifactEditForWrite(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getWebArtifactEditForWrite(aModule.getProject());
- }
-
- /**
- * @param module
- * A {@see WorkbenchComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aModule) throws UnresolveableURIException {
- if (!isValidEditableModule(aModule))
- return false;
- return J2EEProjectUtilities.isDynamicWebProject(aModule.getProject());
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public WebArtifactEdit(ArtifactEditModel model) {
- super(model);
-
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from the given
- * {@see ModuleCoreNature}
- */
- protected WebArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
-
-
- /**
- * <p>
- * Retrieves J2EE version information from WebAppResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- *
- */
- public int getJ2EEVersion() {
- return ((WebAppResource)getDeploymentDescriptorResource()).getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Obtains the WebApp (@see WebApp) root object from the WebAppResource. If the root object does
- * not exist, then one is created (@link addWebAppIfNecessary(getWebApplicationXmiResource())).
- * The root object contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- *
- */
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addWebAppIfNecessary((WebAppResource)getDeploymentDescriptorResource());
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
- * </p>
- *
- * @return Resource
- *
- */
- public Resource getDeploymentDescriptorResource() {
- return getArtifactEditModel().getResource(J2EEConstants.WEBAPP_DD_URI_OBJ);
- }
-
- /**
- * <p>
- * Retrieves Servlet version information derived from the {@see WebAppResource}.
- * </p>
- *
- * @return an integer representation of a module version
- *
- */
- public int getServletVersion() {
- return ((WebAppResource)getDeploymentDescriptorResource()).getModuleVersionID();
- }
-
- /**
- * This method returns the integer representation for the JSP specification level associated with
- * the J2EE version for this workbench module. This method will not return null and returns 20
- * as default.
- * @see WebArtifactEdit#getServletVersion()
- *
- * @return an integer representation of the JSP level
- */
- public int getJSPVersion() {
- int servletVersion = getServletVersion();
- if (servletVersion == J2EEVersionConstants.WEB_2_2_ID)
- return J2EEVersionConstants.JSP_1_1_ID;
- else if (servletVersion == J2EEVersionConstants.WEB_2_3_ID)
- return J2EEVersionConstants.JSP_1_2_ID;
- else
- return J2EEVersionConstants.JSP_2_0_ID;
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebApp) and populates with data. Adds the root
- * object to the deployment descriptor resource.
- * </p>
- *
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource}
- * @param version
- * Version to be set on resource....if null default is taken
- *
- * Note: This method is typically used for JUNIT - move?
- * </p>
- */
- protected void addWebAppIfNecessary(XMLResource aResource) {
- if (aResource != null) {
- if(aResource.getContents() == null || aResource.getContents().isEmpty()) {
- WebApp webAppNew = WebapplicationFactory.eINSTANCE.createWebApp();
- aResource.getContents().add(webAppNew);
- aResource.setModified(true);
- }
- WebApp webApp = (WebApp)aResource.getContents().get(0);
- URI moduleURI = getArtifactEditModel().getModuleURI();
- try {
- webApp.setDisplayName(StructureEdit.getDeployedName(moduleURI));
- } catch (UnresolveableURIException e) {
- //Ignore
- }
- aResource.setID(webApp, J2EEConstants.WEBAPP_ID);
-
- WelcomeFileList wList = WebapplicationFactory.eINSTANCE.createWelcomeFileList();
- webApp.setFileList(wList);
- List files = wList.getFile();
- WelcomeFile file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("index.html"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("index.htm"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("index.jsp"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("default.html"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("default.htm"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("default.jsp"); //$NON-NLS-1$
- files.add(file);
-
- try{
- aResource.saveIfNecessary();
- }catch(java.net.ConnectException ex){
-
- }catch(Exception e){
- e.printStackTrace();
- }
- }
- }
-
-
- /**
- * This method returns the full path to the deployment descriptor resource for the associated
- * workbench module. This method may return null.
- *
- * @see WebArtifactEdit#getDeploymentDescriptorResource()
- *
- * @return the full IPath for the deployment descriptor resource
- */
- public IPath getDeploymentDescriptorPath() {
- IFile file = WorkbenchResourceHelper.getFile(getDeploymentDescriptorResource());
- if (file!=null)
- return file.getFullPath();
- return null;
- }
-
- /**
- * This method will retrieve the web app resource, create it if necessary, add get the root object,
- * the web app out of that web app resource. It will create the web app instance if need be, and add
- * it to the web resource. Then, it returns the web app object as the model root. This method will
- * not return null.
- *
- * @see EnterpriseArtifactEdit#createModelRoot()
- *
- * @return the eObject instance of the model root
- */
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
- /**
- * This method will retrieve the web app resource, create it if necessary, add get the root object, set version
- * the web app out of that web app resource. It will create the web app instance if need be, and add
- * it to the web resource. Then, it returns the web app object as the model root. This method will
- * not return null.
- *
- * @see EnterpriseArtifactEdit#createModelRoot()
- *
- * @return the eObject instance of the model root
- */
- public EObject createModelRoot(int version) {
- WebAppResource res = (WebAppResource)getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addWebAppIfNecessary(res);
- return res.getRootObject();
- }
- /**
- * This method will return the list of dependent modules which are utility jars in the web lib
- * folder of the deployed path of the module. It will not return null.
- *
- * @return array of the web library dependent modules
- */
- public IVirtualReference[] getLibModules() {
- List result = new ArrayList();
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- IVirtualReference[] refComponents = comp.getReferences();
- // Check the deployed path to make sure it has a lib parent folder and matchs the web.xml base path
- for (int i = 0; i < refComponents.length; i++) {
- comp.getRootFolder().getFolder(WEBLIB);
- if (refComponents[i].getRuntimePath().equals(WEBLIB))
- result.add(refComponents[i]);
- }
-
- return (IVirtualReference[]) result.toArray(new IVirtualReference[result.size()]);
- }
-
- /**
- * This method will add the dependent modules from the passed in array to the dependentmodules list
- * of the associated workbench module. It will ensure a null is not passed and it will ensure the
- * dependent modules are not already in the list.
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param libModules array of dependent modules to add as web libraries
- */
- public void addLibModules(ReferencedComponent[] libModules) {
- //TODO - Need to implement
-// if (libModules==null)
-// return;
-// for (int i=0; i<libModules.length; i++) {
-// if (!module.getReferencedComponents().contains(libModules[i]))
-// module.getReferencedComponents().add(libModules[i]);
-// }
- }
-
- /**
- * This method will retrieve the context root for this web project's .component file. It is
- * meant to handle a standalone web case.
- *
- * @return contextRoot String
- */
- public String getServerContextRoot() {
- return J2EEProjectUtilities.getServerContextRoot(getProject());
- }
-
- /**
- * This method sets the context root property on the web project's .component file for
- * the standalone case.
- *
- * @param contextRoot string
- */
- public void setServerContextRoot(String contextRoot) {
- J2EEProjectUtilities.setServerContextRoot(getProject(), contextRoot);
- }
-
- /**
- * @return WebApp
- */
- public WebApp getWebApp() {
-
- return (WebApp)getDeploymentDescriptorRoot();
- }
-
-
- public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
- return getWebArtifactEditForRead(aComponent);
- }
-
-
- public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
- return getWebArtifactEditForWrite(aComponent);
- }
-
- public Archive asArchive(boolean includeSource) throws OpenFailureException{
- WebComponentLoadStrategyImpl loader = new WebComponentLoadStrategyImpl(getComponent());
- loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- return CommonarchiveFactory.eINSTANCE.openWARFile(loader, uri);
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- WebArtifactEdit webEdit = new WebArtifactEdit(project,false,true);
- try {
- webEdit.createModelRoot(version);
- webEdit.save(null);
- } finally {
- webEdit.dispose();
- }
- }
-
- /**
- * This method will retrieve the context root for this web project in the associated parameter's
- * application.xml. If the earProject is null, then the contextRoot from the .component of the web
- * project is returned.
- *
- * @param earProject
- * @return contextRoot String
- */
- public String getServerContextRoot(IProject earProject) {
- if (earProject == null || !J2EEProjectUtilities.isEARProject(earProject))
- return getServerContextRoot();
- EARArtifactEdit earEdit = null;
- String contextRoot = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- if (earEdit!=null )
- contextRoot = earEdit.getWebContextRoot(getProject());
- } finally {
- if (earEdit!=null)
- earEdit.dispose();
- }
- return contextRoot;
- }
-
- /**
- * This method will update the context root for this web project on the EAR which is passed in.
- * If no EAR is passed the .component file for the web project will be updated.
- *
- * @param earProject
- * @param aContextRoot
- */
- public void setServerContextRoot(IProject earProject, String aContextRoot) {
- if (earProject == null || !J2EEProjectUtilities.isEARProject(earProject))
- setServerContextRoot(aContextRoot);
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
- if (earEdit!=null )
- earEdit.setWebContextRoot(getProject(),aContextRoot);
- } finally {
- if (earEdit!=null) {
- earEdit.saveIfNecessary(new NullProgressMonitor());
- earEdit.dispose();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml
deleted file mode 100644
index 6a17c4e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>WebArtifactEdit api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the WebArtifactEdit api. This api is used to work with the emf model
- of a flexible web module. It contains api to read and serialize out the emf model for web applications.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentCreationDataModelProperties.java
deleted file mode 100644
index bcf1661..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,45 +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.jst.j2ee.web.datamodel.properties;
-/**
- * <p>
- * IWebComponentCreationDataModelProperties provides properties to the
- * WebComponentCreationDataModelProvider as well as all extending interfaces extending
- * IWebComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-
-public interface IWebComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties {
-
- /**
- * Required, type String, the user defined name of the context root for the web component
- */
- public static final String CONTEXT_ROOT = IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT;
-
- /**
- * Optional, type String, the user defined name of web contents folder
- */
- public static final String WEBCONTENT_FOLDER = "IWebComponentCreationDataModelProperties.WEBCONTENT_FOLDER";
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java
deleted file mode 100644
index 129150d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,37 +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.jst.j2ee.web.datamodel.properties;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-/**
- * <p>
- * IWebComponentExportDataModelProperties provides properties to the IDataModel associated with the
- * WebComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IWebComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
- /**
- * Required, type Boolean flag which indicates whether or not to export compiled JSP files
- * (compiled files exist in /WEB-INF/classes as .class and .java[for debug])
- */
- public static final String EXCLUDE_COMPILE_JSP = "WebExportDataModel.EXCLUDE_COMPILE_JSP"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
deleted file mode 100644
index 94cc033..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,47 +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.jst.j2ee.web.datamodel.properties;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-
-/**
- * <p>
- * IWebComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * WebComponentImportDataModelProvider. NOTE: The associated Provider and Operations will be created
- * during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IWebComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
- // used to be HANDLED_ARCHIVES
- /**
- * Optional, type List. List containg the Archive objects for all WebLib archives that should be
- * expanded during import.
- */
- public static final String WEB_LIB_ARCHIVES_SELECTED = "WARImportDataModel.WEB_LIB_ARCHIVES_SELECTED"; //$NON-NLS-1$
-
- /**
- * Should not be set by clients. This list contains the models for creating the new components
- * to be created for each of the selected archives. This list will contain one entry for each
- * web lib archive regardless of whether it is selected for import by the WEB_LIB_ARCHIVES_SELECTED property
- */
- public static final String WEB_LIB_MODELS = "WARImportDataModel.WEB_LIB_MODELS"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml
deleted file mode 100644
index bc7e674..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>web module data model api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the api to create, import and export web modules. The interfaces in this package
- define the properties that can be set on the web modules data models that are use to run the data model operations and drive the wizard data, validation.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java
deleted file mode 100644
index f779cb8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,24 +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.jst.j2ee.web.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-
-
-public interface IWebFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
-
- public static final String CONTEXT_ROOT = "IWebFacetInstallDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
- public static final String SOURCE_FOLDER = "IWebFacetInstallDataModelProperties.SOURCE_FOLDER"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
deleted file mode 100644
index e28c43f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,110 +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.jst.j2ee.web.project.facet;
-
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class WebFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IWebFacetInstallDataModelProperties {
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CONTEXT_ROOT);
- names.add(SOURCE_FOLDER);
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(ADD_TO_EAR)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(CONFIG_FOLDER)) {
- return "WebContent";
- } else if (propertyName.equals(SOURCE_FOLDER)) {
- return "src";
- } else if (propertyName.equals(CONTEXT_ROOT)) {
- return getProperty(FACET_PROJECT_NAME);
- } else if (propertyName.equals(FACET_ID)) {
- return J2EEProjectUtilities.DYNAMIC_WEB;
- } else if (propertyName.equals(MODULE_URI)) {
- String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- return projectName + IJ2EEModuleConstants.WAR_EXT;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (ADD_TO_EAR.equals(propertyName)) {
- model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.ENABLE_CHG);
- } else if (FACET_PROJECT_NAME.equals(propertyName)) {
- model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
- } else if (propertyName.equals(CONFIG_FOLDER)) {
- return true;
- } else if (propertyName.equals(SOURCE_FOLDER)) {
- IDataModel masterModel = (IDataModel) model.getProperty(MASTER_PROJECT_DM);
- if (masterModel != null) {
- FacetDataModelMap map = (FacetDataModelMap) masterModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel javaModel = map.getFacetDataModel(IModuleConstants.JST_JAVA);
- if (javaModel != null)
- javaModel.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, propertyValue);
- }
- }
- return super.propertySet(propertyName, propertyValue);
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- return super.isPropertyEnabled(propertyName);
- }
-
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(version.getVersionString());
- }
-
- public IStatus validate(String name) {
- if (name.equals(CONTEXT_ROOT) && getBooleanProperty(ADD_TO_EAR)) {
- return validateContextRoot(getStringProperty(CONTEXT_ROOT));
- }
- return super.validate(name);
- }
-
- protected IStatus validateContextRoot(String contextRoot) {
- if (contextRoot.equals("") || contextRoot == null) { //$NON-NLS-1$
- return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2, new Object[]{contextRoot}), null); //$NON-NLS-1$
- } else if (contextRoot.trim().equals(contextRoot)) {
- StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
- 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) {
- Object[] invalidChar = new Object[]{(new Character(token.charAt(i))).toString()};
- String errorStatus = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar); //$NON-NLS-1$
- return J2EEPlugin.newErrorStatus(errorStatus, null);
- }
- }
- }
- } else
- return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Names_cannot_begin_or_end_with_whitespace_5, new Object[]{contextRoot}), null); //$NON-NLS-1$
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
deleted file mode 100644
index ccd4496..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
+++ /dev/null
@@ -1,270 +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.jst.j2ee.web.project.facet;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-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.emf.ecore.EPackage;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationOp;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.web.classpath.WebAppContainer;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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.IFacetedProject;
-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.IRuntime;
-
-public final class WebFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- final IDataModel model = (IDataModel) cfg;
-
- final IJavaProject jproj = JavaCore.create(project);
-
- // Add WTP natures.
-
- WtpUtils.addNatures(project);
-
- // Create the directory structure.
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
-
- final IPath contentdir = setContentPropertyIfNeeded(model, pjpath, project);
- mkdirs(ws.getRoot().getFolder(contentdir));
-
- final IPath webinf = contentdir.append("WEB-INF"); //$NON-NLS-1$
- IFolder webinfFolder = ws.getRoot().getFolder(webinf);
- mkdirs(webinfFolder);
-
- final IPath webinflib = webinf.append("lib"); //$NON-NLS-1$
- mkdirs(ws.getRoot().getFolder(webinflib));
-
- // Setup the flexible project structure.
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
-
- c.create(0, null);
-
- String contextRoot = model.getStringProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT);
- setContextRootPropertyIfNeeded(c, contextRoot);
- setJavaOutputPropertyIfNeeded(c);
-
- final IVirtualFolder webroot = c.getRootFolder();
- if (webroot.getProjectRelativePath().equals(new Path("/"))) //$NON-NLS-1$
- webroot.createLink(new Path("/" + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)), 0, null); //$NON-NLS-1$
-
- // Create the deployment descriptor (web.xml) if one doesn't exist
- if (!webinfFolder.getFile("web.xml").exists()) { //$NON-NLS-1$
- String ver = fv.getVersionString();
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
- WebArtifactEdit.createDeploymentDescriptor(project, nVer);
- }
-
- // Set entries for src folders
- final IVirtualFolder jsrc = c.getRootFolder().getFolder("/WEB-INF/classes"); //$NON-NLS-1$
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 )
- jsrc.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
- }
- }
-
- IVirtualFile vf = c.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
- if (manifestmf == null || !manifestmf.exists()) {
- try {
- createManifest(project, c.getRootFolder().getUnderlyingFolder(), monitor);
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- } catch (InterruptedException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- // Setup the classpath.
-
- ClasspathHelper.removeClasspathEntries(project, fv);
-
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- // Add the web libraries container.
-
- final IPath cont = new Path(WebAppContainer.CONTAINER_ID);
- addToClasspath(jproj, JavaCore.newContainerEntry(cont));
-
- // Associate with an EAR, if necessary.
-
-
- if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)) {
- final String earProjectName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- if (earProjectName != null && !earProjectName.equals("")) { //$NON-NLS-1$
- String ver = fv.getVersionString();
- String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(ver));
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- installEARFacet(j2eeVersionText, earProjectName, (IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME), monitor);
-
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider() {
- public Object getDefaultProperty(String propertyName) {
- if (IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
- Map map = new HashMap();
- map.put(c, moduleURI);
- return map;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new AddComponentToEnterpriseApplicationOp(model) {
- protected Module createNewModule(IVirtualComponent wc) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createWebModule();
- }
- };
- }
- });
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(c);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- }
- }
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private void setJavaOutputPropertyIfNeeded(final IVirtualComponent c) {
- String existing = c.getMetaProperties().getProperty("java-output-path"); //$NON-NLS-1$
- if (existing == null)
- c.setMetaProperty("java-output-path", "/build/classes/"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- private void setContextRootPropertyIfNeeded(final IVirtualComponent c, String contextRoot) {
- String existing = c.getMetaProperties().getProperty("context-root"); //$NON-NLS-1$
- if (existing == null)
- c.setMetaProperty("context-root", contextRoot); //$NON-NLS-1$
- }
-
-// private IPath setSourcePropertyIfNeeded(final IDataModel model, final IPath pjpath, IProject project) {
-// IVirtualComponent c = ComponentCore.createComponent(project);
-// if (c.exists()) {
-// return J2EEProjectUtilities.getSourcePathOrFirst(project, null).makeAbsolute();
-// }
-// return pjpath.append(model.getStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER));
-// }
-
- 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(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));
- }
-
- private static void addToClasspath(final IJavaProject jproj, final IClasspathEntry entry)
-
- throws CoreException
-
- {
- final IClasspathEntry[] current = jproj.getRawClasspath();
- final IClasspathEntry[] updated = new IClasspathEntry[current.length + 1];
- System.arraycopy(current, 0, updated, 0, current.length);
- updated[current.length] = entry;
- jproj.setRawClasspath(updated, 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.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java
deleted file mode 100644
index 8c67966..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,67 +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.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebFacetRuntimeChangedDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- ClasspathHelper.removeClasspathEntries( project, fv );
-
- if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
- {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
deleted file mode 100644
index d883271..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.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.jst.j2ee.web.project.facet;
-
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class WebFacetUtils {
-
- public static final IProjectFacetVersion WEB_22 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE).getVersion("2.2"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_23 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE).getVersion("2.3"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_24 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE).getVersion("2.4"); //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
deleted file mode 100644
index aa05f73..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
+++ /dev/null
@@ -1,110 +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.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebFacetVersionChangeDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- // Find the version that's currently installed.
-
- final IFacetedProject fproj
- = ProjectFacetsManager.create( project );
-
- final IProjectFacetVersion oldver
- = fproj.getInstalledVersion( fv.getProjectFacet() );
-
- // Reset the classpath.
-
- ClasspathHelper.removeClasspathEntries( project, oldver );
-
- if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
- {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- // Update the component version.
-
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
-
-// final StructureEdit edit
-// = StructureEdit.getStructureEditForWrite( project );
-//
-// try
-// {
-// final ComponentType oldctype
-// = StructureEdit.getComponentType( c );
-//
-// final ComponentType newctype
-// = ComponentcoreFactory.eINSTANCE.createComponentType();
-//
-// newctype.setComponentTypeId( oldctype.getComponentTypeId() );
-// newctype.setVersion( fv.getVersionString() );
-// newctype.getProperties().addAll( oldctype.getProperties() );
-//
-// StructureEdit.setComponentType( c, newctype );
-//
-// edit.saveIfNecessary( null );
-// }
-// finally
-// {
-// edit.dispose();
-// }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath b/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
deleted file mode 100644
index 5c90c5c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="property_files/"/>
- <classpathentry kind="src" path="webservices_ui/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
deleted file mode 100644
index 49af781..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-servletui.jar
-webserviceui.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project b/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
deleted file mode 100644
index 1b17773..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.webservice.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>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7d01e5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WTP Webservice UI Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.webservice.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.j2ee.internal.webservice,
- org.eclipse.jst.j2ee.internal.webservice.plugin
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ui.workbench,
- org.eclipse.jface,
- org.eclipse.jst.j2ee.ui,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee,
- org.eclipse.emf.edit,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee.core,
- org.eclipse.emf.edit.ui,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.ui.ide,
- org.eclipse.wst.common.emf,
- org.eclipse.jst.j2ee.webservice,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.common.navigator.java,
- org.eclipse.wst.common.navigator.views,
- org.eclipse.jem.util,
- org.wsdl4j,
- org.eclipse.jst.common.frameworks
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html b/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
deleted file mode 100644
index e0ae1a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-source.. = property_files/,\
- webservices_ui/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- icons/,\
- META-INF/,\
- about.html
-src.includes = plugin.xml
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
deleted file mode 100644
index eb5f55e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.wst.common.navigator.views.navigatorContent">
- <navigatorContent
- name="Web Services"
- priority="low"
- icon="icons/full/ctool16/webservicedesc.gif"
- contentProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorContentProvider"
- labelProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorLabelProvider"
- openListener="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorGroupOpenListener"
- id="org.eclipse.wst.common.frameworks.internal.navigator.webservice"
- >
- <enables>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType">
- </objectClass>
- <objectClass
- name="org.eclipse.wst.wsdl.util.WSDLResourceImpl">
- </objectClass>
- </or>
- </enables>
- <emfEnablement>
- <package uri="wsdd.xmi" />
- <package uri="webservice_client.xmi" />
- <package uri="wscommon.xmi" />
- <package uri="http://www.ibm.com/wsdl/2003/WSDL"/>
- </emfEnablement>
- </navigatorContent>
- </extension>
-
-
- <!-- J2EE View Web Services contribution -->
-
- <extension
- point="org.eclipse.wst.common.navigator.views.navigatorViewer">
- <navigatorViewer
- rootContentExtensionId="org.eclipse.wst.common.frameworks.internal.navigator.webservice"
- viewerId="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator">
- </navigatorViewer>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
deleted file mode 100644
index 8af63ed..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
+++ /dev/null
@@ -1,46 +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
-###############################################################################
-NEW_BUTTON_LABEL=New...
-NEW_HANDLER_WIZARD_WINDOW_TITLE=New Handler
-NEW_HANDLER_WIZARD_PAGE_TITLE=Web Service Handler
-NEW_HANDLER_WIZARD_PAGE_DESC=Create a new web service handler.
-HANDLER_DISPLAY_NAME_LABEL=Dispaly name:
-HANDLER_DESCRIPTION_LABEL=Description:
-HANDLER_NAME_LABEL=Handler name:
-HANDLER_CLASS_NAME_LABEL=Handler class:
-HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE=Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE=Enter Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_DESC=Creare a new handler initialization parameter.
-HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE=Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE=Enter Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC=Create a new SOAP header.
-HANDLER_NAMESPACE_URL_LABEL=Namespace URL:
-HANDLER_LOCAL_PART_LABEL=Local part:
-PortComponentRefLabelProvider_UI_1=Service Endpoint Interface:
-PortComponentRefLabelProvider_UI_2=Port Component Link:
-WebServiceNavigatorGroupType_UI_0=Services
-WebServiceNavigatorGroupType_UI_1=Clients
-WebServiceNavigatorGroupType_UI_2=Handlers
-WebServiceFilesContribution_UI_0=Files
-WebServiceGroupContentExtension_UI_1=Web Browser
-WebServiceNavigatorGroup_UI_0=Web Services
-Server_Invalid_For_Exisitng_EAR_UI_=Selected target server "{0}" is invalid for the existing EAR project "{1}"
-ServiceReferenceSelectionWizard_UI_6=Service Reference Selection
-ServiceReferenceSelectionWizard_UI_7=Service Reference Snippet
-ServiceReferenceSelectionPage_UI_0=Select a Service Reference
-ServiceReferenceSelectionPage_UI_1=Service Reference owner:
-ServiceReferenceSelectionPage_UI_2=New Service Reference...
-SERVICE_CLASSES_UI_=Service Classes
-PORT_UI_=Port:
-HANDLER_UI_=Handler:
-WSDL_PORT_UI_=WSDL Port:
-SERVICE_IMPL_UI_=ServiceImpl:
-WSDL_UI_=WSDL:
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
deleted file mode 100644
index 3d768c3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
+++ /dev/null
@@ -1,59 +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.jst.j2ee.internal.webservice;
-
-import java.net.URL;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- */
-public class OpenExternalWSDLAction extends AbstractOpenAction {
-
- String uri = ""; //$NON-NLS-1$
-
- /**
- * @param text
- */
- public OpenExternalWSDLAction(String text) {
- super(text);
- this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(J2EEUIPlugin.PLUGIN_ID, "icons/web_type.gif")); //$NON-NLS-1$
- }
-
- public void run() {
- try {
- IWorkbenchBrowserSupport browserSupport = WebServiceUIPlugin.getDefault().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR,"WSDL","",""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- browser.openURL(new URL(uri));
- } catch (Exception e) {
- //Ignore
- }
- }
-
- public boolean updateSelection(IStructuredSelection s) {
- Object obj = s.getFirstElement();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isWSDLResource(obj))
- uri = ((Resource) obj).getURI().toString();
- return super.updateSelection(s);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
deleted file mode 100644
index c3b8aab..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
+++ /dev/null
@@ -1,63 +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
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.internal.emfworkbench.EMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceAdapterFactory extends EMFAdapterFactory {
-
- /**
- * Default constructor
- */
- public WebServiceAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- WsddResource res = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isService(adaptableObject))
- res = WebServicesManager.getInstance().getWsddResource((EObject) adaptableObject);
-
- if (res != null && adapterType == EMFAdapterFactory.IFILE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else if (res != null && adapterType == EMFAdapterFactory.IRESOURCE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else if (res != null && adapterType == EMFAdapterFactory.IPROJECT_CLASS)
- return ProjectUtilities.getProject(res);
- else
- return super.getAdapter(adaptableObject, adapterType);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
deleted file mode 100644
index 37f0a65..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
+++ /dev/null
@@ -1,77 +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
- *******************************************************************************/
-/*
- * Created on Jan 23, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceFilesContribution {
-
- protected WebServiceDescription webService;
- protected List allFiles = null;
-
- /**
- * Constructor
- */
- public WebServiceFilesContribution(WebServiceDescription webService) {
- super();
- this.webService = webService;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return WebServiceUIResourceHandler.WebServiceFilesContribution_UI_0;
- }
-
- public String getWSDLFile() {
- return webService.getWsdlFile();
- }
-
- public String getMappingFile() {
- return webService.getJaxrpcMappingFile();
- }
-
- public List getAllFiles() {
- if (allFiles == null) {
- allFiles = new ArrayList();
- allFiles.add(getWSDLFile());
- allFiles.add(getMappingFile());
- }
- return allFiles;
- }
-
- /**
- * @return Returns the webService.
- */
- public WebServiceDescription getWebService() {
- return webService;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
deleted file mode 100644
index 665e515..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
+++ /dev/null
@@ -1,63 +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
- *******************************************************************************/
-/*
- * Created on Jan 20, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroup {
-
- private String label = WebServiceUIResourceHandler.WebServiceNavigatorGroup_UI_0;
- private IWorkspaceRoot root;
-
- /**
- * Default constructor
- */
- public WebServiceNavigatorGroup(IWorkspaceRoot wsRoot) {
- super();
- root = wsRoot;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return label;
- }
-
- /**
- * @return Returns the root.
- */
- public IWorkspaceRoot getRoot() {
- return root;
- }
-
- /**
- * @param root
- * The root to set.
- */
- public void setRoot(IWorkspaceRoot root) {
- this.root = root;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
deleted file mode 100644
index adfd94b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
+++ /dev/null
@@ -1,133 +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
- *******************************************************************************/
-/*
- * Created on Feb 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroupType implements IActionFilter {
-
- public static final int SERVICES = 0;
- public static final int CLIENTS = 2;
- public static final int HANDLERS = 3;
-
- public static final String SERVICES_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_0;
- public static final String CLIENTS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_1;
- public static final String HANDLERS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_2;
-
- private int TYPE;
- private EObject wsdlService = null;
- private ServiceRef serviceRef = null;
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType) {
- super();
- TYPE = groupType;
- }
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, EObject wsdlService) {
- super();
- TYPE = groupType;
- this.wsdlService = wsdlService;
- }
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, ServiceRef serviceRef) {
- super();
- TYPE = groupType;
- this.serviceRef = serviceRef;
- }
-
- /**
- * @return Returns the TYPE.
- */
- public int getGroupType() {
- return TYPE;
- }
-
- public boolean isServices() {
- return getGroupType() == SERVICES;
- }
-
- public boolean isClients() {
- return getGroupType() == CLIENTS;
- }
-
- public boolean isHandlers() {
- return getGroupType() == HANDLERS;
- }
-
- public EObject getWsdlService() {
- return wsdlService;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- if (isServices())
- return SERVICES_UI;
- else if (isClients())
- return CLIENTS_UI;
- else if (isHandlers())
- return HANDLERS_UI;
- else
- return super.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String,
- * java.lang.String)
- */
- public boolean testAttribute(Object target, String name, String value) {
- if (target != null && target instanceof WebServiceNavigatorGroupType && value != null) {
- WebServiceNavigatorGroupType group = (WebServiceNavigatorGroupType) target;
- if (group.isClients() && value.equals(CLIENTS_UI))
- return true;
- else if (group.isServices() && value.equals(SERVICES_UI))
- return true;
- else if (group.isHandlers() && value.equals(HANDLERS_UI))
- return true;
- }
- return false;
- }
-
- /**
- * @return Returns the serviceRef.
- */
- public ServiceRef getServiceRef() {
- return serviceRef;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
deleted file mode 100644
index ea5227f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
+++ /dev/null
@@ -1,63 +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.jst.j2ee.internal.webservice;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WebServiceUIResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "webserviceui";//$NON-NLS-1$
-
- private WebServiceUIResourceHandler() {
- // Do not instantiate
- }
-
- public static String NEW_BUTTON_LABEL;
- public static String NEW_HANDLER_WIZARD_WINDOW_TITLE;
- public static String NEW_HANDLER_WIZARD_PAGE_TITLE;
- public static String NEW_HANDLER_WIZARD_PAGE_DESC;
- public static String HANDLER_DISPLAY_NAME_LABEL;
- public static String HANDLER_DESCRIPTION_LABEL;
- public static String HANDLER_NAME_LABEL;
- public static String HANDLER_CLASS_NAME_LABEL;
- public static String HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE;
- public static String HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE;
- public static String HANDLER_INIT_PARAM_WIZARD_PAGE_DESC;
- public static String HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE;
- public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE;
- public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC;
- public static String HANDLER_NAMESPACE_URL_LABEL;
- public static String HANDLER_LOCAL_PART_LABEL;
- public static String PortComponentRefLabelProvider_UI_1;
- public static String PortComponentRefLabelProvider_UI_2;
- public static String WebServiceNavigatorGroupType_UI_0;
- public static String WebServiceNavigatorGroupType_UI_1;
- public static String WebServiceNavigatorGroupType_UI_2;
- public static String WebServiceFilesContribution_UI_0;
- public static String WebServiceGroupContentExtension_UI_1;
- public static String WebServiceNavigatorGroup_UI_0;
- public static String Server_Invalid_For_Exisitng_EAR_UI_;
- public static String ServiceReferenceSelectionWizard_UI_6;
- public static String ServiceReferenceSelectionWizard_UI_7;
- public static String ServiceReferenceSelectionPage_UI_0;
- public static String ServiceReferenceSelectionPage_UI_1;
- public static String ServiceReferenceSelectionPage_UI_2;
- public static String SERVICE_CLASSES_UI_;
- public static String PORT_UI_;
- public static String HANDLER_UI_;
- public static String WSDL_PORT_UI_;
- public static String SERVICE_IMPL_UI_;
- public static String WSDL_UI_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WebServiceUIResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
deleted file mode 100644
index 93d9ed3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
+++ /dev/null
@@ -1,295 +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
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceEvent;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceManagerListener;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.common.navigator.internal.provisional.views.INavigatorContentProvider;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorContentProvider extends CommonAdapterFactoryContentProvider implements INavigatorContentProvider, WebServiceManagerListener {
-
- private WebServicesManager webServicesManager = null;
- private boolean activityEnabled = false;
- private WebServiceNavigatorGroup webServiceNavigatorGroup;
- private WebServiceNavigatorGroupType SERVICES = null;
- private WebServiceNavigatorGroupType CLIENTS = null;
- private HashMap HANDLERS = new HashMap();
- private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator";//$NON-NLS-1$
-
- private TreeViewer viewer = null;
-
- public WebServicesNavigatorContentProvider() {
- super(createAdapterFactory());
- WebServicesManager.getInstance().addListener(this);
- // create the default synchronizer for any web service editor to use with view due
- // to the usage of seperate edit models.
- WebServicesNavigatorSynchronizer.createInstance(createAdapterFactory(), this);
-
- }
-
- /**
- * Configure and return a composite adapter factory for our contents
- */
- public static AdapterFactory createAdapterFactory() {
- return new DynamicAdapterFactory(VIEWER_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getChildren(java.lang.Object)
- */
- public Object[] getChildren(Object parentElement) {
-// if (!NavigatorActivityHelper.isActivityEnabled(getContainingExtension())) {
-// activityEnabled = false;
-// return super.getChildren(parentElement);
-// }
-// activityEnabled = true;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (parentElement instanceof IWorkspaceRoot) {
- return new Object[]{getWebServicesNavigatorGroup(parentElement)};
- } else if (parentElement instanceof WebServiceNavigatorGroup) {
- return new Object[]{getServicesGroup(), getClientsGroup()};
- } else if (parentElement instanceof WebServiceNavigatorGroupType && ((WebServiceNavigatorGroupType) parentElement).isServices()) {
- List result = new ArrayList();
- result.addAll(getWebServicesManager().getInternalWSDLServices());
- result.addAll(getWebServicesManager().getExternalWSDLServices());
- return result.toArray();
- } else if (parentElement instanceof WebServiceNavigatorGroupType && ((WebServiceNavigatorGroupType) parentElement).isClients()) {
- return getWebServicesManager().getAllWorkspaceServiceRefs().toArray();
- } else if (serviceHelper.isService(parentElement)) {
- return getServiceLevelNodes(parentElement).toArray();
- } else if (parentElement instanceof WebServiceNavigatorGroupType && ((WebServiceNavigatorGroupType) parentElement).isHandlers()) {
- return getHandlerChildren(parentElement).toArray();
- } else if (parentElement instanceof ServiceRef) {
- Collection result = new ArrayList();
- result.add(getHandlersGroup(parentElement));
- return result.toArray();
- } else if (parentElement instanceof Handler || parentElement instanceof org.eclipse.jst.j2ee.webservice.wsclient.Handler) {
- return new ArrayList().toArray();
- } else if (serviceHelper.isWSDLResource(parentElement))
- return new ArrayList().toArray();
- else
- return super.getChildren(parentElement);
- }
-
- private List getServiceLevelNodes(Object parentElement) {
- List result = new ArrayList();
- // add service classes
- if (getWebServicesManager().isServiceInternal((EObject) parentElement) && getWebServicesManager().getServiceImplBean((EObject) parentElement) != null)
- result.add(getWebServicesManager().getServiceImplBean((EObject) parentElement));
- // Add handlers
- if (getWebServicesManager().isServiceInternal((EObject) parentElement))
- result.add(getHandlersGroup(parentElement));
- //add wsdl file
- Resource wsdl = getWebServicesManager().getWSDLResource((EObject) parentElement);
- if (wsdl != null)
- result.add(wsdl);
- return result;
- }
-
- private List getHandlerChildren(Object parentElement) {
- List result = new ArrayList();
- WebServiceNavigatorGroupType handlersGroup = (WebServiceNavigatorGroupType) parentElement;
- // handle web service handlers case
- if (handlersGroup.getWsdlService() != null) {
- PortComponent port = WebServicesManager.getInstance().getPortComponent(handlersGroup.getWsdlService());
- if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty())
- result.addAll(port.getHandlers());
- }
- // handle service ref case
- else if (handlersGroup.getServiceRef() != null) {
- result.addAll(handlersGroup.getServiceRef().getHandlers());
- }
- return result;
- }
-
- /**
- * @param parentElement
- * @return
- */
- protected WebServiceNavigatorGroup getWebServicesNavigatorGroup(Object parentElement) {
- if (webServiceNavigatorGroup == null)
- webServiceNavigatorGroup = new WebServiceNavigatorGroup((IWorkspaceRoot) parentElement);
- return webServiceNavigatorGroup;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object element) {
- if (element instanceof IWorkspaceRoot)
- return null;
- else if (element instanceof WebServiceNavigatorGroup)
- return ((WebServiceNavigatorGroup) element).getRoot();
- else
- return super.getParent(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object element) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- // TODO handle change events
- if (aViewer !=null && aViewer instanceof TreeViewer)
- viewer = (TreeViewer)aViewer;
- super.inputChanged(aViewer,oldInput,newInput);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- super.dispose();
- WebServicesManager.getInstance().removeListener(this);
- // dispose current instance of web service editor/explorer synchronizer
- WebServicesNavigatorSynchronizer.disposeInstance();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void webServiceManagerChanged(WebServiceEvent anEvent) {
- if (getViewer()==null) return;
- Display d = null;
- try {
- d = getViewer().getControl().getDisplay();
- } catch (Exception e) {
- //Ignore
- }
- if (d != Display.getCurrent() & d != null) {
- d.asyncExec(new Runnable() {
- public void run() {
- getViewer().refresh(getNavigatorGroup());
- }
- });
- } else
- getViewer().refresh(getNavigatorGroup());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- /**
- * @return Returns the navigatorGroup.
- */
- public WebServiceNavigatorGroup getNavigatorGroup() {
- if (null == webServiceNavigatorGroup) {
- webServiceNavigatorGroup = new WebServiceNavigatorGroup(ResourcesPlugin.getWorkspace().getRoot());
- }
- return webServiceNavigatorGroup;
- }
-
- protected WebServicesManager getWebServicesManager() {
- if (webServicesManager == null)
- webServicesManager = WebServicesManager.getInstance();
- return webServicesManager;
- }
-
- /**
- * @return Returns the activityEnabled.
- */
- public boolean isActivityEnabled() {
- return activityEnabled;
- }
-
- private WebServiceNavigatorGroupType getServicesGroup() {
- if (SERVICES == null)
- SERVICES = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.SERVICES);
- return SERVICES;
- }
-
- private WebServiceNavigatorGroupType getClientsGroup() {
- if (CLIENTS == null)
- CLIENTS = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.CLIENTS);
- return CLIENTS;
- }
-
- private WebServiceNavigatorGroupType getHandlersGroup(Object key) {
- if (key == null)
- return null;
- WebServiceNavigatorGroupType handler = null;
- handler = (WebServiceNavigatorGroupType) HANDLERS.get(key);
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (handler == null) {
- if (serviceHelper.isService(key))
- handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (EObject) key);
- else if (key instanceof ServiceRef)
- handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (ServiceRef) key);
- if (handler != null)
- HANDLERS.put(key, handler);
- }
- return handler;
- }
- /**
- * @return Returns the viewer.
- */
- public TreeViewer getViewer() {
- return viewer;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
deleted file mode 100644
index 23607b3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 10, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServicesNavigatorGroupOpenListener implements IOpenListener {
-
- private OpenExternalWSDLAction openExternalWSDLAction = new OpenExternalWSDLAction(WebServiceUIResourceHandler.WebServiceGroupContentExtension_UI_1);
- private OpenJ2EEResourceAction openAction = new OpenJ2EEResourceAction();
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IOpenListener#open(org.eclipse.jface.viewers.OpenEvent)
- */
- public void open(OpenEvent event) {
- if (event == null)
- return;
- StructuredSelection selection = (StructuredSelection)event.getSelection();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (selection == null || selection.getFirstElement()==null)
- return;
- Object selectedObject = selection.getFirstElement();
- if (serviceHelper==null)
- return;
- else if (serviceHelper.isWSDLResource(selectedObject)) {
- Resource wsdl = (Resource) selectedObject;
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- openExternalWSDLAction.run();
- return;
- }
- openAction.selectionChanged(selection);
- openAction.run();
- }
- else if (selectedObject instanceof ServiceImpl) {
- WsddResource resource = WebServicesManager.getInstance().getWsddResource((ServiceImpl)selectedObject);
- List wsddSelection = new ArrayList();
- wsddSelection.add(resource);
-
- openAction.selectionChanged(new StructuredSelection(wsddSelection));
- openAction.run();
- }
- else if (selectedObject instanceof ServiceRef) {
- if (!WebServicesManager.getInstance().isJ2EE14((ServiceRef)selectedObject)) {
- IVirtualComponent component = ComponentUtilities.findComponent((ServiceRef)selectedObject);
- ArtifactEdit artifactEdit = null;
- try {
- artifactEdit = ArtifactEdit.getArtifactEditForRead(component);
- List module = new ArrayList();
- module.add(artifactEdit.getContentModelRoot());
- selection = new StructuredSelection(module);
- } finally {
- if (artifactEdit != null)
- artifactEdit.dispose();
- }
- }
- openAction.selectionChanged(selection);
- openAction.run();
- }
- else {
- openAction.selectionChanged(selection);
- openAction.run();
- }
- }
- //TODO fill open with menu for web services group
-
-// return new CommonEditActionGroup(getExtensionSite()) {
-// public void fillOpenWithMenu(IMenuManager menu) {
-// if ((getExtensionSite().getSelection().getFirstElement() instanceof BeanLink)) {
-// openAction.selectionChanged(getExtensionSite().getSelection());
-// menu.insertAfter(ICommonMenuConstants.COMMON_MENU_TOP, openAction);
-// } else if ((getExtensionSite().getSelection().getFirstElement() instanceof WSDLResourceImpl)) {
-// WSDLResourceImpl wsdl = (WSDLResourceImpl) getExtensionSite().getSelection().getFirstElement();
-// IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-// if (wsdlFile == null || !wsdlFile.exists()) {
-// openExternalWSDLAction.selectionChanged(getExtensionSite().getSelection());
-// menu.insertAfter(ICommonMenuConstants.COMMON_MENU_TOP, openExternalWSDLAction);
-// }
-// }
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
deleted file mode 100644
index 5f1d285..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
+++ /dev/null
@@ -1,189 +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
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorLabelProvider extends AdapterFactoryLabelProvider implements ILabelProvider {
-
- private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";//$NON-NLS-1$
-
- public WebServicesNavigatorLabelProvider() {
- super(createAdapterFactory());
- }
-
- /**
- * Configure and return a composite adapter factory for our contents
- */
- public static AdapterFactory createAdapterFactory() {
- return new DynamicAdapterFactory(VIEWER_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- public Image getImage(Object element) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (element instanceof WebServiceNavigatorGroup)
- return J2EEUIPlugin.getDefault().getImage("webServicesFolder_obj"); //$NON-NLS-1$
- else if (element instanceof String)
- return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
- else if (element instanceof WebServiceNavigatorGroupType)
- return J2EEUIPlugin.getDefault().getImage("folder"); //$NON-NLS-1$
- else if (serviceHelper.isService(element)) {
- if (WebServicesManager.getInstance().isServiceInternal((EObject) element))
- return J2EEUIPlugin.getDefault().getImage("webServiceItemProvider_obj"); //$NON-NLS-1$
- return J2EEUIPlugin.getDefault().getImage("extwebserviceitemprovider_obj"); //$NON-NLS-1$
- } else if (serviceHelper.isWSDLResource(element))
- return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
- else
- return super.getImage(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- public String getText(Object element) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- String space = " "; //$NON-NLS-1$
- if (element instanceof WebServiceDescription)
- return getWebServiceDescriptionText((WebServiceDescription) element);
- else if (element instanceof PortComponent)
- return WebServiceUIResourceHandler.PORT_UI_ + space + super.getText(element);
- else if (element instanceof Handler)
- return WebServiceUIResourceHandler.HANDLER_UI_ + space + super.getText(element);
- else if (element instanceof WSDLPort)
- return WebServiceUIResourceHandler.WSDL_PORT_UI_ + space + super.getText(element);
- else if (element instanceof ServiceImplBean)
- return WebServiceUIResourceHandler.SERVICE_CLASSES_UI_;
- else if (element instanceof EJBLink)
- return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element);
- else if (element instanceof ServletLink)
- return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element);
- else if (serviceHelper.isService(element))
- return serviceHelper.getServiceLocalPart(element);
- else if (serviceHelper.isWSDLResource(element)) {
- String result = ""; //$NON-NLS-1$
- IFile file = WorkbenchResourceHelper.getFile((Resource) element);
- if (file != null && file.exists())
- result = file.getFullPath().toString();
- else
- result = ((Resource) element).getURI().toString();
- return WebServiceUIResourceHandler.WSDL_UI_ + space + result;
- } else if (element instanceof ServiceRef) {
- String beanName14 = ""; //$NON-NLS-1$
- if (WebServicesManager.getInstance().isJ2EE14((ServiceRef) element)) {
- if (((ServiceRef) element).eContainer() instanceof Session)
- beanName14 = ((Session) ((ServiceRef) element).eContainer()).getName() + ": "; //$NON-NLS-1$
- }
-
- return ProjectUtilities.getProject((ServiceRef) element).getName() + ": " + beanName14 //$NON-NLS-1$
- + ((ServiceRef) element).getServiceRefName();
- } else
- return super.getText(element);
- }
-
- /**
- * get text for web service
- */
- private String getWebServiceDescriptionText(WebServiceDescription description) {
- Resource res = description.eResource();
- IProject project = null;
- String projString = ""; //$NON-NLS-1$
- if (res != null)
- project = WorkbenchResourceHelper.getProject(res);
- if (project != null)
- projString = project.getName() + ": "; //$NON-NLS-1$
- return projString + super.getText(description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- // TODO add any listeners?
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- // TODO handle dispose
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- // TODO do something smart here?
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- // TODO how do we remove listeners?
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
deleted file mode 100644
index 66be80f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
+++ /dev/null
@@ -1,105 +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
- *******************************************************************************/
-/*
- * Created on Jun 10, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-/**
- * @author jlanuti
- */
-public class WebServicesNavigatorSynchronizer extends CommonAdapterFactoryContentProvider implements Adapter {
-
-
- private static WebServicesNavigatorSynchronizer INSTANCE = null;
- protected Notifier target = null;
- private WebServicesNavigatorContentProvider contentProvider = null;
-
- /**
- * Constructor
- */
- public WebServicesNavigatorSynchronizer(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
- super(adapterFactory);
- contentProvider = provider;
- }
-
- public static WebServicesNavigatorSynchronizer getInstance() {
- return INSTANCE;
- }
-
- public static WebServicesNavigatorSynchronizer createInstance(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
- INSTANCE = new WebServicesNavigatorSynchronizer(adapterFactory, provider);
- return INSTANCE;
- }
-
- public static void disposeInstance() {
- INSTANCE = null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#getTarget()
- */
- public Notifier getTarget() {
- return target;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
- */
- public void setTarget(Notifier newTarget) {
- target = newTarget;
- }
-
- public void notifyChanged(final Notification notification) {
- EObject notifier = (EObject) notification.getNotifier();
-
- if (notifier instanceof WebServices)
- return;
-
- if (notifier instanceof ServiceRef) {
- contentProvider.getViewer().refresh(notifier);
- return;
- }
-
- while (!(notifier instanceof WebServiceDescription) && notifier != null)
- notifier = notifier.eContainer();
-
- if (notifier instanceof WebServiceDescription && notifier !=null) {
- EObject wsdl = WebServicesManager.getInstance().getWSDLServiceForWebService((WebServiceDescription) notifier);
- contentProvider.getViewer().refresh(wsdl);
- }
- super.notifyChanged(notification);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
deleted file mode 100644
index 06c866b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
+++ /dev/null
@@ -1,61 +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
- *******************************************************************************/
-/*
- * Created on Mar 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.EMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WsdlResourceAdapterFactory extends EMFAdapterFactory {
-
- /**
- * Default constructor
- */
- public WsdlResourceAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- Resource res = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isWSDLResource(adaptableObject))
- res = (Resource) adaptableObject;
-
- if (res != null && adapterType == EMFAdapterFactory.IFILE_CLASS)
- return WorkbenchResourceHelper.getFile(res) != null ? WorkbenchResourceHelper.getFile(res) : null;
- else if (res != null && adapterType == EMFAdapterFactory.IRESOURCE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else if (res != null && adapterType == EMFAdapterFactory.IPROJECT_CLASS)
- return ProjectUtilities.getProject(res);
- else
- return super.getAdapter(adaptableObject, adapterType);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 19bd202..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Nov 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServiceUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.webservice.ui"; //$NON-NLS-1$
-
- // The shared instance.
- private static WebServiceUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public WebServiceUIPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static WebServiceUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.classpath b/plugins/org.eclipse.jst.j2ee.webservice/.classpath
deleted file mode 100644
index be3b410..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="webservice/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore b/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore
deleted file mode 100644
index 14417fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-webservice.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.project b/plugins/org.eclipse.jst.j2ee.webservice/.project
deleted file mode 100644
index 5fcfb43..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.webservice</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
deleted file mode 100644
index 6b224c7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web Service Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.webservice; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.j2ee.internal.webservice.adapter,
- org.eclipse.jst.j2ee.internal.webservice.command,
- org.eclipse.jst.j2ee.internal.webservice.componentcore.util,
- org.eclipse.jst.j2ee.internal.webservice.constants,
- org.eclipse.jst.j2ee.internal.webservice.helper,
- org.eclipse.jst.j2ee.internal.webservice.plugin,
- org.eclipse.jst.j2ee.internal.webservice.provider,
- org.eclipse.jst.j2ee.internal.wsdd.provider
-Require-Bundle: org.eclipse.jst.j2ee,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee.core,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit,
- org.eclipse.jem,
- org.eclipse.jdt.core,
- org.eclipse.core.runtime,
- org.eclipse.jst.common.frameworks,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.wst.ws.parser,
- org.eclipse.wst.wsdl,
- org.wsdl4j,
- org.eclipse.jem.util,
- org.eclipse.wst.common.project.facet.core
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/about.html b/plugins/org.eclipse.jst.j2ee.webservice/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/build.properties b/plugins/org.eclipse.jst.j2ee.webservice/build.properties
deleted file mode 100644
index f40d5ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/build.properties
+++ /dev/null
@@ -1,21 +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
-###############################################################################
-bin.includes = plugin.xml,\
- .,\
- icons/,\
- images/,\
- plugin.properties,\
- META-INF/,\
- about.html
-source.. = webservice/,\
- property_files/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/component.xml b/plugins/org.eclipse.jst.j2ee.webservice/component.xml
deleted file mode 100644
index 780cb13..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/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.jst.j2ee.webservice"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.webservice" fragment="false"/><plugin id="org.eclipse.jst.j2ee.webservice.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif
deleted file mode 100644
index ac0d8b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index eb074fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 0c05357..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index f4df8d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 94dd253..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index 02c00da..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif
deleted file mode 100644
index 3b9e4ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif
deleted file mode 100644
index 022f2b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif
deleted file mode 100644
index ff93e09..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif
deleted file mode 100644
index 80ca95e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif
deleted file mode 100644
index 3db9aa7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif
deleted file mode 100644
index cc5b0b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif
deleted file mode 100644
index 11202c5..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif
deleted file mode 100644
index 083d44b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif
deleted file mode 100644
index 8aee367..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif
deleted file mode 100644
index da0b7ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif
deleted file mode 100644
index 767ee93..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif
deleted file mode 100644
index 543f6df..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif
deleted file mode 100644
index 98bbc52..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif
deleted file mode 100644
index 87e4705..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif
deleted file mode 100644
index 17c6fea..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif
deleted file mode 100644
index 87e4705..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif
deleted file mode 100644
index 17c6fea..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif
deleted file mode 100644
index df680ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif
deleted file mode 100644
index 5b3180b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif
deleted file mode 100644
index c707b34..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif
deleted file mode 100644
index 7bf9926..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif
deleted file mode 100644
index afeb425..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif
deleted file mode 100644
index 2c77245..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif
deleted file mode 100644
index f507a84..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif
deleted file mode 100644
index b5dd75e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif
deleted file mode 100644
index 2dbc34d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif
deleted file mode 100644
index b54d742..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif
deleted file mode 100644
index c2f688e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif
deleted file mode 100644
index 012ad9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif
deleted file mode 100644
index 2124f3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif
deleted file mode 100644
index 136e3b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif
deleted file mode 100644
index 33854e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif
deleted file mode 100644
index 134551b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif
deleted file mode 100644
index a26660ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif
deleted file mode 100644
index 48e3cf2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif
deleted file mode 100644
index 7bf9926..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif
deleted file mode 100644
index ed87474..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif
deleted file mode 100644
index 7bac4fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif
deleted file mode 100644
index c8d381f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif
deleted file mode 100644
index 9041598..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif
deleted file mode 100644
index 1e5345f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif
deleted file mode 100644
index a17dc7d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif
deleted file mode 100644
index 89ad5da..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif
deleted file mode 100644
index 120b020..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif
deleted file mode 100644
index 1c8339c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif
deleted file mode 100644
index b930e2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif
deleted file mode 100644
index 670c5c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif
deleted file mode 100644
index 16bc425..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif
deleted file mode 100644
index 69ec361..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif b/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif b/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif
deleted file mode 100644
index fd0c669..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties b/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties
deleted file mode 100644
index d783f2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties
+++ /dev/null
@@ -1,156 +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
-###############################################################################
-# ----------------------------------------------------------------------
-# Properties for com.ibm.etools.webservice.atk.ui
-#
-# Entries are of the form CONSTANT=string
-#
-# File plugins/com.ibm.etools.webservice.atk.ui/plugin.properties, wsa.etools.ws.properties, lunar, 20030922a 26
-# Version 1.26 03/09/09 16:41:49
-# ----------------------------------------------------------------------
-
-#
-# Messages in plugin.xml.
-#
-
-
-
-#
-# Edit models
-#
-WSDD_EDIT_MODEL_NAME=Web Services Edit Model
-EDITOR_EDITMODELS_WEB_SERVICES=Web Services Editor Edit Model
-WSCDD_EDIT_MODEL_NAME=Web Services Client Edit Model
-EDITOR_EDITMODELS_WEB_SERVICES_CLIENT=Web Services Client Editor Edit Model
-
-#
-#Common Editor Messages
-#
-TITLE_SAVE_ERROR=Save Error
-MSG_SAVE_ERROR=An error occurred when attempting to save editor contents.
-
-#
-# Messages in WebServicesEditor
-#
-
-#
-# Messages in WebServicesClientEditor
-#
-
-
-
-#
-# Messages in WebServicesPage
-#
-
-
-#
-# Messages in PortComponentPage
-#
-
-
-#
-# Messages in HandlerPage
-#
-
-
-#
-# Messages in WebServicesClientPage
-#
-
-
-#
-# Messages in ServiceRefPage
-#
-
-
-#
-# Labels
-#
-LABEL_UNQUALIFIED_COMPONENT=<unqualified>
-LABEL_SERVLET_LINK=Servlet link
-
-
-
-#
-# Labels for table layout
-#
-LABEL_TABLE_NAME=Name
-LABEL_TABLE_VALUE=Value
-LABEL_TABLE_SOAP_ROLE=SOAP role
-LABEL_TABLE_PORT_NAME=Port name
-LABEL_TABLE_PORT_COMPONENT_LINK=Port component link
-LABEL_TABLE_DESCRIPTION=Description
-
-#
-# Page and Section titles/descriptions
-#
-
-
-
-
-#
-# Dialog labels
-#
-
-
-#
-# Tooltips
-#
-
-
-#
-# Labels for providers
-#
-_UI_WebServiceDescription_type=Web service description
-_UI_PortComponent_type=Port component
-_UI_Handler_type=Handler
-_UI_PortComponentRef_type=Port component reference
-_UI_ServiceRef_type=Service reference
-_UI_WebServicesClient_type=Web services client
-_UI_ComponentScopedRefs_type=Component scoped reference
-_UI_WSDLPort_type=WSDL port
-_UI_WebServices_type=Web services
-_UI_ServletLink_type=Servlet link
-_UI_ServiceImplBean_type=Service implementation bean
-_UI_EJBLink_type=EJB link
-_UI_BeanLink_type=Bean link
-_UI_SOAPRole_type=SOAP role
-_UI_SOAPHeader_type=SOAP header
-_UI_PortName_type=Port name
-_UI_InitParam_type=Initial parameter
-_UI_ServiceRef_jaxrpcMappingFile_feature=Jaxrpc Mapping File
-_UI_ServiceRef_jaxrpcMappingFile_feature_desc=The jaxrpc mapping file.
-_UI_ServiceRef_serviceInterface_feature=Service Interface
-_UI_ServiceRef_serviceInterface_feature_desc=The service interface.
-_UI_ServiceRef_serviceRefName_feature=Name
-_UI_ServiceRef_serviceRefName_feature_desc=The service reference name.
-_UI_ServiceRef_wsdlFile_feature=Wsdl File
-_UI_ServiceRef_wsdlFile_feature_desc=The .wsdl file.
-_UI_PortComponentRef_serviceEndpointInterface_feature=Service Endpoint Interface
-_UI_PortComponentRef_serviceEndpointInterface_feature_desc=The service endpoint interface.
-_UI_PortComponentRef_portComponentLink_feature=Link
-_UI_PortComponentRef_portComponentLink_feature_desc=The port component link.
-_UI_Handler_soapRoles_feature=Soap Roles
-_UI_Handler_soapRoles_feature_desc=The handler soap roles.
-_UI_Handler_portNames_feature=Port Names
-_UI_Handler_portNames_feature_desc=The handler port names.
-_UI_Handler_handlerName_feature=Handler Name
-_UI_Handler_handlerName_feature_desc=The handler name.
-_UI_Handler_handlerClass_feature=Handler Class
-_UI_Handler_handlerClass_feature_desc=The handler class.
-_UI_InitParam_paramName_feature=Name
-_UI_InitParam_paramName_feature_desc=The initial parameter name.
-_UI_InitParam_description_feature=Description
-_UI_InitParam_description_feature_desc=The initial parameter description.
-_UI_InitParam_paramValue_feature=Value
-_UI_InitParam_paramValue_feature_desc=The initial parameter value.
-
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml
deleted file mode 100644
index 6605628..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-<!-- Dyanmic Content Provider extensions -->
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactory"
- packageURI="webservice_client.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.WscommonItemProviderAdapterFactory"
- packageURI="wscommon.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.WscommonItemProviderAdapterFactory">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="client.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactoryForClient">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="webservice_client.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForWSClient">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="ejb.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForEJB">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="webapplication.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForWEB">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.WsddItemProviderAdapterFactory"
- packageURI="wsdd.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.WsddItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
- <editModelExtension
- editModelID="jst.web"
- id="webservices.web.editModelextension">
- <editModelResource
- URI="WEB-INF/webservicesclient.xml">
- </editModelResource>
- <editModelResource
- URI="WEB-INF/webservices.xml">
- </editModelResource>
- </editModelExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
- <editModelExtension
- editModelID="jst.ejb"
- id="webservices.ejb.editModelextension">
- <editModelResource
- URI="META-INF/webservicesclient.xml">
- </editModelResource>
- <editModelResource
- URI="META-INF/webservices.xml">
- </editModelResource>
- </editModelExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
- <editModelExtension
- editModelID="jst.appclient"
- id="webservices.appclient.editModelextension">
- <editModelResource
- URI="META-INF/webservicesclient.xml">
- </editModelResource>
- <editModelResource
- URI="META-INF/webservices.xml">
- </editModelResource>
- </editModelExtension>
- </extension>
-
- <extension
- id="WSDLServiceHelper"
- name="WSDLServiceHelper"
- point="org.eclipse.jst.j2ee.WSDLServiceHelper">
- <wsdlHelper
- helperClass="org.eclipse.jst.j2ee.internal.webservice.helper.WSDLServiceHelperImpl">
- </wsdlHelper>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml
deleted file mode 100644
index c58f273..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.webservice"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties b/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties
deleted file mode 100644
index 8a7b0a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-ERR_HANDLER_DISPLAY_NAME_EMPTY=The handler name cannot be empty.
-ERR_HANDLER_DISPLAY_NAME_EXIST=The handler name already exists.
-ERR_HANDLER_PARAM_NAME_EMPTY=The handler initialization parameter name cannot be empty.
-ERR_HANDLER_NAMESPACE_URL_EMPTY=The handler name space URL cannot be empty.ServiceRefItemProvider.0=ServiceRef
-ERR_HANDLER_PARAM_NAME_EXISTS=The parameter name already exist.
-ERR_HANDLER_NAMESPACE_URL_EXISTS=The handler name space URL already exisit, please change name.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
deleted file mode 100644
index 5cf43b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
+++ /dev/null
@@ -1,133 +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.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-
-public class AdapterCCombo extends AdapterImpl implements SelectionListener {
- private EObject eObject_;
- private EStructuralFeature feature_;
- private EStructuralFeature displayFeature_;
- private CCombo combo_;
- private String defaultDisplayString_;
-
- public AdapterCCombo(EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo, String defaultDisplayString) {
- super();
- eObject_ = null;
- feature_ = feature;
- displayFeature_ = displayFeature;
- combo_ = combo;
- combo_.addSelectionListener(this);
- defaultDisplayString_ = (defaultDisplayString != null) ? defaultDisplayString : ""; //$NON-NLS-1$
- }
-
- public AdapterCCombo(EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo) {
- this(feature, displayFeature, combo, null);
- }
-
- public AdapterCCombo(EObject eObject, EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo) {
- this(eObject, feature, displayFeature, combo, null);
- }
-
- public AdapterCCombo(EObject eObject, EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo, String defaultDisplayString) {
- this(feature, displayFeature, combo, defaultDisplayString);
- adapt(eObject);
- }
-
- public void notifyChanged(Notification msg) {
- Object notifier = msg.getNotifier();
- if (notifier == eObject_) {
- int type = msg.getEventType();
- if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY)
- populateCombo();
- } else if (msg.getFeature() == displayFeature_)
- populateCombo();
- }
-
- private void populateCombo() {
- if (eObject_ != null) {
- Object object = eObject_.eGet(feature_);
- if (object != null) {
- if (combo_.isDisposed())
- return;
- int selectionIndex = combo_.getSelectionIndex();
- String text = combo_.getText();
- combo_.removeAll();
- if (object instanceof EList) {
- EList eList = (EList) object;
- for (Iterator it = eList.iterator(); it.hasNext();)
- combo_.add(toDisplayString(((EObject) it.next()).eGet(displayFeature_)));
- } else
- combo_.add(toDisplayString(((EObject) object).eGet(displayFeature_)));
- int newIndex = combo_.indexOf(text);
- if (selectionIndex != -1 && newIndex != -1)
- combo_.select(newIndex);
- else
- combo_.select(0);
- }
- }
- }
-
- private String toDisplayString(Object object) {
- if (object != null) {
- String s = object.toString();
- if (s != null && s.length() > 0)
- return s;
- }
- return defaultDisplayString_;
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //Do nothing
- }
-
- public void widgetSelected(SelectionEvent e) {
- //Do nothing
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null) {
- eObject_.eAdapters().remove(this);
- combo_.removeAll();
- }
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- Object object = eObject_.eGet(feature_);
- if (object instanceof EList) {
- for (Iterator it = ((EList) object).iterator(); it.hasNext();) {
- Object item = it.next();
- if (item instanceof EObject)
- ((EObject) item).eAdapters().add(this);
- }
- } else if (object instanceof EObject)
- ((EObject) object).eAdapters().add(this);
- populateCombo();
- }
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (combo_ != null && !combo_.isDisposed())
- combo_.removeSelectionListener(this);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java
deleted file mode 100644
index faf03da..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java
+++ /dev/null
@@ -1,199 +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.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandAddElement;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandRemoveElement;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterElement extends AdapterImpl implements ModifyListener {
- private ArtifactEdit artifactEdit;
- private EObject parent_;
- private EClass childEClass_;
- private EStructuralFeature childFeature_;
- private boolean childNillable_;
- private EStructuralFeature[] features_;
- private boolean[] featuresNillable_;
- private Text[] featuresTexts_;
- private AdapterText[] featuresAdapters_;
-
- public AdapterElement(ArtifactEdit anArtifactEdit, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, EStructuralFeature[] features, boolean[] featuresNillable, Text[] featuresTexts) {
- super();
- artifactEdit = anArtifactEdit;
- parent_ = null;
- childEClass_ = childEClass;
- childFeature_ = childFeature;
- childNillable_ = childNillable;
- features_ = features;
- featuresNillable_ = featuresNillable;
- featuresTexts_ = featuresTexts;
- addModifyListener();
- featuresAdapters_ = new AdapterText[features_.length];
- newAdapters(null);
- }
-
- public AdapterElement(ArtifactEdit anArtifactEdit, EObject parent, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, EStructuralFeature[] features, boolean[] featuresNillable, Text[] featuresTexts) {
- this(anArtifactEdit, childEClass, childFeature, childNillable, features, featuresNillable, featuresTexts);
- adapt(parent);
- }
-
- private void newAdapters(EObject eObject) {
- if (eObject == null)
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i] = new AdapterText(artifactEdit, features_[i], featuresTexts_[i], featuresNillable_[i]);
- else
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i] = new AdapterText(artifactEdit, eObject, features_[i], featuresTexts_[i], featuresNillable_[i]);
- }
-
- private void addModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- featuresTexts_[i].addModifyListener(this);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && msg.getFeature() == childFeature_) {
- EObject child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- boolean isTextsNull = isTextsNull();
- EObject child = (EObject) parent_.eGet(childFeature_);
- boolean childCanBeRemoved = true;
- if (child != null) {
- Iterator allfeatures = childEClass_.getEAllStructuralFeatures().iterator();
- while (allfeatures.hasNext()) {
- EStructuralFeature thisFeature = (EStructuralFeature) allfeatures.next();
- if (!adaptingFeature(thisFeature) && child.eIsSet(thisFeature)) {
- childCanBeRemoved = false;
- break;
- }
- }
- }
- if (isTextsNull && child != null && childNillable_ && childCanBeRemoved) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- CommandRemoveElement command = new CommandRemoveElement(null, null, parent_, childFeature_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(null);
- } else if (!isTextsNull && child == null) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- child = createChild();
- for (int i = 0; i < features_.length; i++) {
- String text = featuresTexts_[i].getText();
- if (text != null && text.length() > 0)
- child.eSet(features_[i], text);
- }
- CommandAddElement command = new CommandAddElement(null, null, parent_, childFeature_, child);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(child);
- }
- }
-
- private boolean isTextsNull() {
- for (int i = 0; i < featuresTexts_.length; i++) {
- String text = featuresTexts_[i].getText();
- if (text != null && text.length() > 0)
- return false;
- }
- return true;
- }
-
- public void adapt(EObject eObject) {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- parent_ = eObject;
- EObject child = null;
- if (parent_ != null) {
- parent_.eAdapters().add(this);
- child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- }
- removeModifyListener();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- addModifyListener();
- }
-
- private EObject setChild() {
- EObject child = createChild();
- parent_.eAdapters().remove(this);
- parent_.eSet(childFeature_, child);
- parent_.eAdapters().add(this);
- return child;
- }
-
- private EObject createChild() {
- EFactory childFactory = childEClass_.getEPackage().getEFactoryInstance();
- EObject child = childFactory.create(childEClass_);
- for (int i = 0; i < features_.length; i++) {
- if (!featuresNillable_[i])
- child.eSet(features_[i], ""); //$NON-NLS-1$
- }
- return child;
- }
-
- public void dispose() {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- disposeAdapters();
- removeModifyListener();
- }
-
- private void disposeAdapters() {
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].dispose();
- }
-
- private void removeModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- if (featuresTexts_[i] != null && !featuresTexts_[i].isDisposed())
- featuresTexts_[i].removeModifyListener(this);
- }
-
- private boolean adaptingFeature(EStructuralFeature feature) {
- if (features_ == null)
- return false;
-
- for (int i = 0; i < features_.length; i++) {
- if (feature == features_[i]) {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java
deleted file mode 100644
index a39e822..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java
+++ /dev/null
@@ -1,162 +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.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterExpiresCCombo extends AdapterImpl implements ModifyListener {
- private ArtifactEdit artifactEdit_;
- private EObject eObject_;
- private EStructuralFeature feature_;
- private CCombo year_;
- private CCombo month_;
- private CCombo day_;
- private CCombo hour_;
- private CCombo minute_;
- private CCombo second_;
- private CCombo msecond_;
- private boolean nillable_;
-
- public AdapterExpiresCCombo(ArtifactEdit artifactEdit, EStructuralFeature feature, CCombo year, CCombo month, CCombo day, CCombo hour, CCombo minute, CCombo second, CCombo msecond, boolean nillable) {
- super();
- artifactEdit_ = artifactEdit;
- eObject_ = null;
- feature_ = feature;
- year_ = year;
- month_ = month;
- day_ = day;
- hour_ = hour;
- minute_ = minute;
- second_ = second;
- msecond_ = msecond;
- nillable_ = nillable;
- year_.addModifyListener(this);
- month_.addModifyListener(this);
- day_.addModifyListener(this);
- hour_.addModifyListener(this);
- minute_.addModifyListener(this);
- second_.addModifyListener(this);
- msecond_.addModifyListener(this);
- }
-
- public AdapterExpiresCCombo(ArtifactEdit artifactEdit, EObject eObject, EStructuralFeature feature, CCombo year, CCombo month, CCombo day, CCombo hour, CCombo minute, CCombo second, CCombo msecond, boolean nillable) {
- this(artifactEdit, feature, year, month, day, hour, minute, second, msecond, nillable);
- adapt(eObject);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
- setText(msg.getNewStringValue());
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, expires(), nillable_);
- artifactEdit_.getContentModelRoot().eResource().setModified(true);
- artifactEdit_.getCommandStack().execute(command);
- }
- }
-
- public String expires() {
- return "P" + //$NON-NLS-1$
- year_.getText() + "Y" + //$NON-NLS-1$
- month_.getText() + "M" + //$NON-NLS-1$
- day_.getText() + "DT" + //$NON-NLS-1$
- hour_.getText() + "H" + //$NON-NLS-1$
- minute_.getText() + "M" + //$NON-NLS-1$
- second_.getText() + "." + //$NON-NLS-1$
- msecond_.getText() + "S"; //$NON-NLS-1$
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- setText((String) eObject_.eGet(feature_));
- }
- }
-
- public void adapt(EObject eObject, EStructuralFeature feature) {
- feature_ = feature;
- adapt(eObject);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (year_ != null && !year_.isDisposed())
- year_.removeModifyListener(this);
- if (month_ != null && !month_.isDisposed())
- month_.removeModifyListener(this);
- if (day_ != null && !day_.isDisposed())
- day_.removeModifyListener(this);
- if (hour_ != null && !hour_.isDisposed())
- hour_.removeModifyListener(this);
- if (minute_ != null && !minute_.isDisposed())
- minute_.removeModifyListener(this);
- if (second_ != null && !second_.isDisposed())
- second_.removeModifyListener(this);
- if (msecond_ != null && !msecond_.isDisposed())
- msecond_.removeModifyListener(this);
-
- }
-
- private boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = (String) eObject_.eGet(feature_);
- String value = expires();
- if (modelValue == null || modelValue.length() <= 0)
- return !(value == null || value.length() <= 0);
- return !(modelValue.equals(value));
- }
- return false;
- }
-
- private void setText(String modelValue) {
- if (modelValue != null) {
- int y = modelValue.indexOf("Y"); //$NON-NLS-1$
- int mo = modelValue.indexOf("M"); //$NON-NLS-1$
- int d = modelValue.indexOf("D"); //$NON-NLS-1$
- int h = modelValue.indexOf("H"); //$NON-NLS-1$
- int mi = modelValue.lastIndexOf("M"); //$NON-NLS-1$
- int s = modelValue.indexOf("."); //$NON-NLS-1$
- int ms = modelValue.indexOf("S"); //$NON-NLS-1$
-
- if (!year_.isDisposed() && y > 0)
- year_.setText(modelValue.substring(1, y));
- if (!month_.isDisposed() && mo > 0)
- month_.setText(modelValue.substring(y + 1, mo));
- if (!day_.isDisposed() && d > 0)
- day_.setText(modelValue.substring(mo + 1, d));
- if (!hour_.isDisposed() && h > 0)
- hour_.setText(modelValue.substring(d + 2, h));
- if (!minute_.isDisposed() && mi > 0)
- minute_.setText(modelValue.substring(h + 1, mi));
- if (!second_.isDisposed() && s > 0)
- second_.setText(modelValue.substring(mi + 1, s));
- if (!msecond_.isDisposed() && ms > 0)
- msecond_.setText(modelValue.substring(s + 1, ms));
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
deleted file mode 100644
index a3ab5bf..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
+++ /dev/null
@@ -1,129 +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.jst.j2ee.internal.webservice.adapter;
-
-/*
- * import org.eclipse.emf.ecore.EObject;
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyHandlerClassText;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterHandlerClassText extends AdapterImpl implements ModifyListener {
- protected ArtifactEdit artifactEdit;
- protected Handler eObject_;
- protected EStructuralFeature feature_;
- protected Text text_;
- protected boolean nillable_;
-
- public AdapterHandlerClassText(ArtifactEdit anArtifactEdit, Text text) {
- super();
- artifactEdit = anArtifactEdit;
- eObject_ = null;
- feature_ = Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass();
- text_ = text;
- nillable_ = false;
- text_.addModifyListener(this);
- }
-
- public AdapterHandlerClassText(ArtifactEdit anArtifactEdit, Handler eObject, Text text) {
- this(anArtifactEdit, text);
- adapt(eObject);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
- String newClassName = eObject_.getHandlerClass().getQualifiedNameForReflection();
- setText(newClassName);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyHandlerClassText command = new CommandModifyHandlerClassText(null, null, eObject_, text_.getText());
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
- }
-
- public void adapt(Handler eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- String newClassName = eObject_.getHandlerClass().getQualifiedNameForReflection();
- setText(newClassName);
- } else
- setText(null);
- }
-
- /*
- * public void adapt(EObject eObject, EStructuralFeature feature) { feature_ = feature;
- * adapt(eObject); }
- */
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = eObject_.getHandlerClass().getQualifiedNameForReflection();
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- private void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-
- /**
- * @return Returns the j2eeEditModel.
- */
- public ArtifactEdit getArtifactEdit() {
- return artifactEdit;
- }
-
- /**
- * @param editModel
- * The j2eeEditModel to set.
- */
- public void setArtifactEdit(ArtifactEdit anArtifactEdit) {
- artifactEdit = anArtifactEdit;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java
deleted file mode 100644
index 729d0d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java
+++ /dev/null
@@ -1,89 +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.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class AdapterLayer extends AdapterImpl {
- private EObject parent_;
- private EStructuralFeature feature_;
- private EClass childEClass_;
- private EObject child_;
-
- public AdapterLayer(EObject parent, EStructuralFeature feature, EClass childEClass) {
- super();
- parent_ = parent;
- feature_ = feature;
- childEClass_ = childEClass;
- adapt(parent_);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY)
- adaptParent();
- }
-
- public void adapt(EObject eObject) {
- if (child_ != null)
- child_.eAdapters().remove(this);
- parent_ = eObject;
- adaptChild();
- if (child_ != null)
- child_.eAdapters().add(this);
- }
-
- public void dispose() {
- if (child_ != null)
- child_.eAdapters().remove(this);
- }
-
- public EObject getChild() {
- return child_;
- }
-
- private void adaptChild() {
- if (parent_ != null) {
- Object object = parent_.eGet(feature_);
- if (object == null)
- child_ = childEClass_.getEPackage().getEFactoryInstance().create(childEClass_);
- else
- child_ = (EObject) object;
- } else
- child_ = null;
- }
-
- private void adaptParent() {
- if (parent_ != null && child_ != null) {
- EList childFeatures = childEClass_.getEAllStructuralFeatures();
- for (Iterator it = childFeatures.iterator(); it.hasNext();) {
- EStructuralFeature childFeature = (EStructuralFeature) it.next();
- boolean isFeatureSet;
- Object grandchild = child_.eGet(childFeature);
- if (grandchild != null && grandchild instanceof EList)
- isFeatureSet = !((EList) grandchild).isEmpty();
- else
- isFeatureSet = child_.eIsSet(childFeature);
- if (isFeatureSet) {
- parent_.eSet(feature_, child_);
- return;
- }
- }
- parent_.eUnset(feature_);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java
deleted file mode 100644
index 831d04d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java
+++ /dev/null
@@ -1,116 +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
- *******************************************************************************/
-/*
- * Created on Jan 21, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifySEI;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-/**
- * @author rsinha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AdapterPCRefText extends AdapterText {
- public AdapterPCRefText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, feature, text, nillable);
- }
-
-
- public AdapterPCRefText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, eObject, feature, text, nillable);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
- Object obj = eObject_.eGet(feature_);
- String objStringValue = ""; //$NON-NLS-1$
- if (obj instanceof String) {
- objStringValue = (String) obj;
- } else if (obj instanceof JavaClass) {
- JavaClass javaClass = (JavaClass) obj;
- objStringValue = javaClass.getQualifiedNameForReflection();
- }
- setText(objStringValue);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- //Handle PortComponentRef_ServiceEndpointInterface feature in a special way.
- String SEIFeatureName = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface().getName();
- if ((eObject_ instanceof PortComponentRef) && (feature_.getName().equals(SEIFeatureName))) {
- CommandModifySEI command = new CommandModifySEI(null, null, (PortComponentRef) eObject_, text_.getText(), nillable_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- } else {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- Object obj = eObject_.eGet(feature_);
- String objStringValue = ""; //$NON-NLS-1$
- if (obj instanceof String) {
- objStringValue = (String) obj;
- } else if (obj instanceof JavaClass) {
- JavaClass javaClass = (JavaClass) obj;
- objStringValue = javaClass.getQualifiedNameForReflection();
- }
- setText(objStringValue);
- } else
- setText(null);
- }
-
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue;
- //Handle PortComponentRef_ServiceEndpointInterface feature in a special way.
- String SEIFeatureName = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface().getName();
- if ((eObject_ instanceof PortComponentRef) && (feature_.getName().equals(SEIFeatureName))) {
- modelValue = ((PortComponentRef) eObject_).getServiceEndpointInterface().getQualifiedNameForReflection();
- } else {
- modelValue = (String) eObject_.eGet(feature_);
- }
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java
deleted file mode 100644
index 6a030e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java
+++ /dev/null
@@ -1,247 +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.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandAddElement;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandRemoveElement;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-/**
- * Generic eSet's will not work when setting namespaceURIs on QName's so AdapterElement cannot be
- * used when the child is a QName. This class is very similar AdapterElement but has special
- * behaviour for handling QName's.
- */
-public class AdapterQNameElement extends AdapterImpl implements ModifyListener {
-
- private ArtifactEdit artifactEdit;
- private EObject parent_;
- private EClass childEClass_;
- private EStructuralFeature childFeature_;
- private boolean childNillable_;
- private EStructuralFeature[] features_;
- private boolean[] featuresNillable_;
- private Text[] featuresTexts_;
- private AdapterText[] featuresAdapters_;
-
- /**
- *
- */
- public AdapterQNameElement(ArtifactEdit anArtifactEdit, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, Text nsURIText, Text localPartText) {
- super();
- artifactEdit = anArtifactEdit;
- parent_ = null;
- childEClass_ = childEClass;
- childFeature_ = childFeature;
- childNillable_ = childNillable;
- CommonPackage commonPKG = CommonPackage.eINSTANCE;
- // Set up QName features
- features_ = new EStructuralFeature[2];
- features_[0] = commonPKG.getQName_NamespaceURI();
- features_[1] = commonPKG.getQName_LocalPart();
- featuresNillable_ = new boolean[2];
- featuresNillable_[0] = false;
- featuresNillable_[1] = false;
- featuresTexts_ = new Text[2];
- featuresTexts_[0] = nsURIText;
- featuresTexts_[1] = localPartText;
- addModifyListener();
- featuresAdapters_ = new AdapterText[features_.length];
- newAdapters(null);
-
- }
-
- /**
- *
- */
- public AdapterQNameElement(ArtifactEdit anArtifactEdit, EObject parent, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, Text nsURIText, Text localPartText) {
- this(anArtifactEdit, childEClass, childFeature, childNillable, nsURIText, localPartText);
- adapt(parent);
- }
-
- private void newAdapters(EObject eObject) {
- if (eObject == null) {
- featuresAdapters_[0] = new AdapterQNameText(artifactEdit, features_[0], featuresTexts_[0], featuresNillable_[0]);
- featuresAdapters_[1] = new AdapterText(artifactEdit, features_[1], featuresTexts_[1], featuresNillable_[1]);
- } else {
- featuresAdapters_[0] = new AdapterQNameText(artifactEdit, eObject, features_[0], featuresTexts_[0], featuresNillable_[0]);
- featuresAdapters_[1] = new AdapterText(artifactEdit, eObject, features_[1], featuresTexts_[1], featuresNillable_[1]);
- }
- }
-
- private void addModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- featuresTexts_[i].addModifyListener(this);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && msg.getFeature() == childFeature_) {
- EObject child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- boolean isTextsNull = isTextsNull();
- EObject child = (EObject) parent_.eGet(childFeature_);
- boolean childCanBeRemoved = true;
- if (child != null) {
- Iterator allfeatures = childEClass_.getEAllStructuralFeatures().iterator();
- while (allfeatures.hasNext()) {
- EStructuralFeature thisFeature = (EStructuralFeature) allfeatures.next();
- if (!adaptingFeature(thisFeature) && child.eIsSet(thisFeature)) {
- childCanBeRemoved = false;
- break;
- }
- }
- }
- if (isTextsNull && child != null && childNillable_ && childCanBeRemoved) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- CommandRemoveElement command = new CommandRemoveElement(null, null, parent_, childFeature_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(null);
- } else if (!isTextsNull && child == null) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- child = createChild();
- setFeaturesOnChild(child);
- /*
- * replaced by setFeaturesOnChild for (int i = 0; i < features_.length; i++) { String
- * text = featuresTexts_[i].getText(); if (text != null && text.length() > 0)
- * child.eSet(features_[i], text); }
- */
- CommandAddElement command = new CommandAddElement(null, null, parent_, childFeature_, child);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(child);
- }
- }
-
- private boolean isTextsNull() {
- for (int i = 0; i < featuresTexts_.length; i++) {
- String text = featuresTexts_[i].getText();
- if (text != null && text.length() > 0)
- return false;
- }
- return true;
- }
-
- public void adapt(EObject eObject) {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- parent_ = eObject;
- EObject child = null;
- if (parent_ != null) {
- parent_.eAdapters().add(this);
- child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- }
- removeModifyListener();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- addModifyListener();
- }
-
- private EObject setChild() {
- EObject child = createChild();
- parent_.eAdapters().remove(this);
- parent_.eSet(childFeature_, child);
- parent_.eAdapters().add(this);
- return child;
- }
-
- private EObject createChild() {
- EFactory childFactory = childEClass_.getEPackage().getEFactoryInstance();
- EObject child = childFactory.create(childEClass_);
- for (int i = 0; i < features_.length; i++) {
- if (!featuresNillable_[i])
- child.eSet(features_[i], ""); //$NON-NLS-1$
- }
- return child;
- }
-
- public void dispose() {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- disposeAdapters();
- removeModifyListener();
- }
-
- private void disposeAdapters() {
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].dispose();
- }
-
- private void removeModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- if (featuresTexts_[i] != null && !featuresTexts_[i].isDisposed())
- featuresTexts_[i].removeModifyListener(this);
- }
-
- private boolean adaptingFeature(EStructuralFeature feature) {
- if (features_ == null)
- return false;
-
- for (int i = 0; i < features_.length; i++) {
- if (feature == features_[i]) {
- return true;
- }
- }
-
- return false;
- }
-
- protected void setFeaturesOnChild(EObject child) {
- if (child instanceof QName) //This will always be true.
- {
- QName qname = (QName) child;
- String namespaceURIValue = featuresTexts_[0].getText();
- String localPartValue = featuresTexts_[1].getText();
- if (namespaceURIValue == null || namespaceURIValue.length() == 0) {
- //Just set the local part
- if (localPartValue != null && localPartValue.length() > 0)
- qname.setLocalPart(localPartValue);
-
- } else {
- if (localPartValue == null)
- localPartValue = ""; //$NON-NLS-1$
-
- //Set namespace and local part using QNameHelper
- QNameHelper.setQNameValue(qname, namespaceURIValue, localPartValue);
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java
deleted file mode 100644
index 60968f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java
+++ /dev/null
@@ -1,62 +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.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyNSURI;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-
-
-/**
- * Since generic eSet's will not work for setting QName namespaceURI's, this subclass's purpose is
- * to override the behaviour when necessary.
- */
-public class AdapterQNameText extends AdapterText {
-
- public AdapterQNameText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, feature, text, nillable);
- }
-
-
- public AdapterQNameText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, eObject, feature, text, nillable);
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- //Handle QName_NamespaceURI feature in a special way.
- String namespaceFeatureName = CommonPackage.eINSTANCE.getQName_NamespaceURI().getName();
- if ((eObject_ instanceof QName) && (feature_.getName().equals(namespaceFeatureName))) {
- CommandModifyNSURI command = new CommandModifyNSURI(null, null, (QName) eObject_, text_.getText(), nillable_);
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- } else {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
-
-
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
deleted file mode 100644
index 4c1184c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
+++ /dev/null
@@ -1,117 +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.jst.j2ee.internal.webservice.adapter;
-
-/*
- * import org.eclipse.emf.ecore.EObject;
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyServiceInterfaceText;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterServiceInterfaceText extends AdapterImpl implements ModifyListener {
- protected ArtifactEdit artifactEdit;
- protected ServiceRef eObject_;
- protected EStructuralFeature feature_;
- protected Text text_;
- protected boolean nillable_;
-
- public AdapterServiceInterfaceText(ArtifactEdit anArtifactEdit, Text text) {
- super();
- artifactEdit = anArtifactEdit;
- eObject_ = null;
- feature_ = Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface();
- text_ = text;
- nillable_ = false;
- text_.addModifyListener(this);
- }
-
- public AdapterServiceInterfaceText(ArtifactEdit anArtifactEdit, ServiceRef eObject, Text text) {
- this(anArtifactEdit, text);
- adapt(eObject);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
- String newClassName = eObject_.getServiceInterface().getQualifiedNameForReflection();
- setText(newClassName);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyServiceInterfaceText command = new CommandModifyServiceInterfaceText(null, null, eObject_, text_.getText());
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
-
- public void adapt(ServiceRef eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- if (eObject_.getServiceInterface() != null) {
- String newClassName = eObject_.getServiceInterface().getQualifiedNameForReflection();
- setText(newClassName);
- } else {
- setText(null);
- }
- } else
- setText(null);
- }
-
- /*
- * public void adapt(EObject eObject, EStructuralFeature feature) { feature_ = feature;
- * adapt(eObject); }
- */
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = null;
- if (eObject_.getServiceInterface() != null)
- modelValue = eObject_.getServiceInterface().getQualifiedNameForReflection();
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- private void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java
deleted file mode 100644
index 3fdd4dd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java
+++ /dev/null
@@ -1,123 +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.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterText extends AdapterImpl implements ModifyListener {
- protected EObject eObject_;
- protected EStructuralFeature feature_;
- protected Text text_;
- protected boolean nillable_;
- protected ArtifactEdit artifactEdit;
-
- public AdapterText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
- super();
- artifactEdit = anArtifactEdit;
- eObject_ = null;
- feature_ = feature;
- text_ = text;
- nillable_ = nillable;
- text_.addModifyListener(this);
- }
-
- public AdapterText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
- this(anArtifactEdit, feature, text, nillable);
- adapt(eObject);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
- setText(msg.getNewStringValue());
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- setText((String) eObject_.eGet(feature_));
- } else
- setText(null);
- }
-
- public void adapt(EObject eObject, EStructuralFeature feature) {
- feature_ = feature;
- adapt(eObject);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = (String) eObject_.eGet(feature_);
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- protected void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-
- /**
- * @return Returns the j2eeEditModel.
- */
- public ArtifactEdit getArtifactEdit() {
- return artifactEdit;
- }
-
- /**
- * @param editModel
- * The j2eeEditModel to set.
- */
- public void setArtifactEdit(ArtifactEdit anArtifactEdit) {
- artifactEdit = anArtifactEdit;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java
deleted file mode 100644
index 63822fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java
+++ /dev/null
@@ -1,105 +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.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterTextCCombo extends AdapterImpl implements ModifyListener {
- private ArtifactEdit artifactEdit_;
- private EObject eObject_;
- private EStructuralFeature feature_;
- private CCombo text_;
- private boolean nillable_;
-
- public AdapterTextCCombo(ArtifactEdit artifactEdit, EStructuralFeature feature, CCombo text, boolean nillable) {
- super();
- artifactEdit_ = artifactEdit;
- eObject_ = null;
- feature_ = feature;
- text_ = text;
- nillable_ = nillable;
- text_.addModifyListener(this);
- }
-
- public AdapterTextCCombo(ArtifactEdit artifactEdit, EObject eObject, EStructuralFeature feature, CCombo text, boolean nillable) {
- this(artifactEdit, feature, text, nillable);
- adapt(eObject);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
- setText(msg.getNewStringValue());
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- artifactEdit_.getContentModelRoot().eResource().setModified(true);
- artifactEdit_.getCommandStack().execute(command);
- }
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- setText((String) eObject_.eGet(feature_));
- } else
- setText(null);
- }
-
- public void adapt(EObject eObject, EStructuralFeature feature) {
- feature_ = feature;
- adapt(eObject);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- private boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = (String) eObject_.eGet(feature_);
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- private void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java
deleted file mode 100644
index 20629a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java
+++ /dev/null
@@ -1,147 +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.jst.j2ee.internal.webservice.adapter;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.Viewer;
-
-public class AdapterViewer extends AdapterImpl {
- private EObject eObject_;
- private Viewer viewer_;
- private ArrayList features_;
-
- public AdapterViewer(Viewer viewer) {
- super();
- eObject_ = null;
- viewer_ = viewer;
- features_ = new ArrayList();
- }
-
- public AdapterViewer(EObject eObject, Viewer viewer) {
- this(viewer);
- adapt(eObject);
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY) {
- Object notifier = msg.getNotifier();
- if (notifier == eObject_) {
- if (type == Notification.SET || type == Notification.ADD || type == Notification.ADD_MANY)
- internalAdaptFeature((EStructuralFeature) msg.getFeature());
- else if (type == Notification.UNSET || type == Notification.REMOVE || type == Notification.REMOVE_MANY) {
- Object object = msg.getOldValue();
- if (object instanceof EObject)
- ((EObject) object).eAdapters().remove(this);
- else if (object instanceof EList) {
- EList eList = (EList) object;
- for (int i = 0; i < eList.size(); i++) {
- Object item = eList.get(i);
- if (item instanceof EObject)
- ((EObject) item).eAdapters().remove(this);
- }
- }
- }
- }
- viewer_.refresh();
- }
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null) {
- eObject_.eAdapters().remove(this);
- unadaptAllCachedFeature();
- }
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- readaptAllCachedFeature();
- }
- viewer_.refresh();
- }
-
- public void adaptFeature(EStructuralFeature feature) {
- if (!features_.contains(feature)) {
- features_.add(feature);
- internalAdaptFeature(feature);
- }
- }
-
- private void internalAdaptFeature(EStructuralFeature feature) {
- if (eObject_ != null) {
- Object featureObject = eObject_.eGet(feature);
- if (featureObject instanceof EObject) {
- EList eAdapters = ((EObject) featureObject).eAdapters();
- if (!eAdapters.contains(this))
- eAdapters.add(this);
- } else if (featureObject instanceof EList) {
- EList eList = (EList) featureObject;
- for (int i = 0; i < eList.size(); i++) {
- Object object = eList.get(i);
- if (object instanceof EObject) {
- EList eAdapters = ((EObject) object).eAdapters();
- if (!eAdapters.contains(this))
- eAdapters.add(this);
- }
- }
- }
- }
- }
-
- private void readaptAllCachedFeature() {
- EStructuralFeature[] features = new EStructuralFeature[features_.size()];
- for (int i = 0; i < features.length; i++)
- features[i] = (EStructuralFeature) features_.get(i);
- for (int i = 0; i < features.length; i++)
- internalAdaptFeature(features[i]);
- }
-
- public void unadaptFeature(EStructuralFeature feature) {
- features_.remove(feature);
- internalUnadaptFeature(feature);
- }
-
- private void internalUnadaptFeature(EStructuralFeature feature) {
- if (eObject_ != null) {
- Object featureObject = eObject_.eGet(feature);
- if (featureObject instanceof EObject)
- ((EObject) featureObject).eAdapters().remove(this);
- else if (featureObject instanceof EList) {
- EList eList = (EList) featureObject;
- for (int i = 0; i < eList.size(); i++) {
- Object object = eList.get(i);
- if (object instanceof EObject)
- ((EObject) object).eAdapters().remove(this);
- }
- }
- }
- }
-
- private void unadaptAllCachedFeature() {
- EStructuralFeature[] features = new EStructuralFeature[features_.size()];
- for (int i = 0; i < features.length; i++)
- features[i] = (EStructuralFeature) features_.get(i);
- for (int i = 0; i < features.length; i++)
- internalUnadaptFeature(features[i]);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- unadaptAllCachedFeature();
- features_ = null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java
deleted file mode 100644
index cdba309..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java
+++ /dev/null
@@ -1,39 +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.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class AdapterViewerItem {
- private EList eObjects_;
- private EStructuralFeature feature_;
-
- public AdapterViewerItem(EList eObjects, EStructuralFeature feature) {
- eObjects_ = eObjects;
- feature_ = feature;
- }
-
- public AdapterViewerItem(EObject eObject, EStructuralFeature feature) {
- eObjects_ = new BasicEList();
- eObjects_.add(eObject);
- feature_ = feature;
- }
-
- public EList getEObjectList() {
- return eObjects_;
- }
-
- public EStructuralFeature getEStructuralFeature() {
- return feature_;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
deleted file mode 100644
index 6da963b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
+++ /dev/null
@@ -1,193 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddClientHandler extends AbstractCommand {
- private ServiceRef parent_;
- private Handler newChild_;
-
- //private boolean oldChildSet_;
-
- public CommandAddClientHandler(String label, String description, ServiceRef parent, Handler newChild) {
- super(label, description);
- parent_ = parent;
- newChild_ = newChild;
- }
-
- public CommandAddClientHandler(String label, String description, ServiceRef parent, String handlerName, JavaClass handlerClass) {
- super(label, description);
- parent_ = parent;
- newChild_ = createNewHandler(handlerName, handlerClass);
- }
-
- public CommandAddClientHandler(String label, String description, ServiceRef parent, String handlerName, String handlerClassName) {
- super(label, description);
- parent_ = parent;
- JavaClass handlerClass = JavaRefFactory.eINSTANCE.createClassRef(handlerClassName);
- newChild_ = createNewHandler(handlerName, handlerClass);
- }
-
- private Handler createNewHandler(String handlerName, JavaClass handlerClass) {
- Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
- Handler newChild = factory.createHandler();
- newChild.setHandlerName(handlerName);
- newChild.setHandlerClass(handlerClass);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- parent_.getHandlers().add(newChild_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- parent_.getHandlers().remove(newChild_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
deleted file mode 100644
index 34a7ffc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
+++ /dev/null
@@ -1,207 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandAddElement extends AbstractCommand {
- private EObject parent_;
- private EStructuralFeature childFeature_;
- private Object newChild_;
- private Object oldChild_;
- private boolean oldChildSet_;
-
- public CommandAddElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild) {
- super(label, description);
- parent_ = parent;
- childFeature_ = childFeature;
- newChild_ = newChild;
- oldChild_ = null;
- oldChildSet_ = true;
- }
-
- public CommandAddElement(String label, String description, EObject parent, EClass childEClass, EStructuralFeature childFeature, EStructuralFeature[] childProperties, Object[] propertyValues) {
- super(label, description);
- parent_ = parent;
- childFeature_ = childFeature;
- newChild_ = createNewChild(childEClass, (childProperties != null) ? childProperties : new EStructuralFeature[0], (propertyValues != null) ? propertyValues : new Object[0]);
- oldChild_ = null;
- oldChildSet_ = true;
- }
-
- private Object createNewChild(EClass childEClass, EStructuralFeature[] childProperties, Object[] propertyValues) {
- EFactory eFactory = childEClass.getEPackage().getEFactoryInstance();
- EObject newChild = eFactory.create(childEClass);
- if (newChild != null)
- for (int i = 0; i < childProperties.length; i++)
- newChild.eSet(childProperties[i], propertyValues[i]);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany()) {
- if (newChild_ != null)
- ((EList) parent_.eGet(childFeature_)).add(newChild_);
- } else {
- oldChild_ = parent_.eGet(childFeature_);
- oldChildSet_ = parent_.eIsSet(childFeature_);
- parent_.eSet(childFeature_, newChild_);
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (childFeature_.isMany()) {
- if (newChild_ != null)
- ((EList) parent_.eGet(childFeature_)).remove(newChild_);
- } else {
- if (oldChildSet_)
- parent_.eSet(childFeature_, oldChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
deleted file mode 100644
index b33c0ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
+++ /dev/null
@@ -1,193 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddPortComponentRef extends AbstractCommand {
- private ServiceRef parent_;
- private PortComponentRef newChild_;
-
- //private boolean oldChildSet_;
-
- public CommandAddPortComponentRef(String label, String description, ServiceRef parent, PortComponentRef newChild) {
- super(label, description);
- parent_ = parent;
- newChild_ = newChild;
- }
-
- public CommandAddPortComponentRef(String label, String description, ServiceRef parent, String portComponentLink, JavaClass serviceEndpointInterface) {
- super(label, description);
- parent_ = parent;
- newChild_ = createNewPortComponentRef(portComponentLink, serviceEndpointInterface);
- }
-
- public CommandAddPortComponentRef(String label, String description, ServiceRef parent, String portComponentLink, String seiName) {
- super(label, description);
- parent_ = parent;
- JavaClass seiClass = JavaRefFactory.eINSTANCE.createClassRef(seiName);
- newChild_ = createNewPortComponentRef(portComponentLink, seiClass);
- }
-
- private PortComponentRef createNewPortComponentRef(String portComponentLink, JavaClass serviceEndpointInterface) {
- Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
- PortComponentRef newChild = factory.createPortComponentRef();
- newChild.setPortComponentLink(portComponentLink);
- newChild.setServiceEndpointInterface(serviceEndpointInterface);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- parent_.getPortComponentRefs().add(newChild_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- parent_.getPortComponentRefs().remove(newChild_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
deleted file mode 100644
index 2392005..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
+++ /dev/null
@@ -1,185 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddServiceRef extends AbstractCommand {
- private WebServicesClient parent_;
- private ServiceRef newChild_;
-
- //private boolean oldChildSet_;
-
- public CommandAddServiceRef(String label, String description, WebServicesClient parent, ServiceRef newChild) {
- super(label, description);
- parent_ = parent;
- newChild_ = newChild;
- }
-
- public CommandAddServiceRef(String label, String description, WebServicesClient parent, String serviceRefName, JavaClass serviceInterface) {
- super(label, description);
- parent_ = parent;
- newChild_ = createNewServiceRef(serviceRefName, serviceInterface);
- }
-
- private ServiceRef createNewServiceRef(String serviceRefName, JavaClass serviceInterface) {
- Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
- ServiceRef newChild = factory.createServiceRef();
- newChild.setServiceRefName(serviceRefName);
- newChild.setServiceInterface(serviceInterface);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- parent_.getServiceRefs().add(newChild_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- parent_.getServiceRefs().remove(newChild_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
deleted file mode 100644
index 3f26254..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
+++ /dev/null
@@ -1,182 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandModifyElement extends AbstractCommand {
- private EObject parent_;
- private EStructuralFeature[] properties_;
- private Object[] propertyValues_;
- private Object[] oldPropertyValues_;
-
- public CommandModifyElement(String label, String description, EObject parent, EStructuralFeature[] properties, Object[] propertyValues) {
- super(label, description);
- parent_ = parent;
- properties_ = properties;
- propertyValues_ = propertyValues;
-
- }
-
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldPropertyValues_ = new Object[properties_.length];
-
- if (parent_ != null) {
- for (int i = 0; i < properties_.length; i++) {
- oldPropertyValues_[i] = parent_.eGet(properties_[i]);
- parent_.eSet(properties_[i], propertyValues_[i]);
- }
- }
-
-
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
-
- if (parent_ != null) {
- for (int i = 0; i < oldPropertyValues_.length; i++) {
- parent_.eSet(properties_[i], oldPropertyValues_[i]);
- }
- }
-
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
deleted file mode 100644
index a91436f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
+++ /dev/null
@@ -1,183 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandModifyHandlerClassText extends AbstractCommand {
- private Handler eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private JavaClass oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyHandlerClassText(String label, String description, Handler eObject, String newValue) {
- super(label, description);
- eObject_ = eObject;
- feature_ = Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass();
- if (newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = false;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getHandlerClass();
- eObject_.setHandlerClass(JavaRefFactory.eINSTANCE.createClassRef(newValue_));
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (oldIsSet_)
- eObject_.setHandlerClass(oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
deleted file mode 100644
index 9ba37eb..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
+++ /dev/null
@@ -1,183 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-
-public class CommandModifyNSURI extends AbstractCommand {
- private QName eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private Object oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyNSURI(String label, String description, QName eObject, String newValue, boolean nillable) {
- super(label, description);
- eObject_ = eObject;
- feature_ = CommonPackage.eINSTANCE.getQName_NamespaceURI();
- if (nillable && (newValue == null || newValue.length() <= 0))
- newValue_ = null;
- else if (!nillable && newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = nillable;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getNamespaceURI();
- QNameHelper.setQNameNamespaceURI(eObject_, newValue_);
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (oldIsSet_)
- eObject_.eSet(feature_, oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
deleted file mode 100644
index c030e0f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
+++ /dev/null
@@ -1,196 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- *
- */
-public class CommandModifySEI extends AbstractCommand {
- private PortComponentRef eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private Object oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
-
- public CommandModifySEI(String label, String description, PortComponentRef eObject, String newValue, boolean nillable) {
- super(label, description);
- eObject_ = eObject;
- feature_ = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface();
- if (nillable && (newValue == null || newValue.length() <= 0))
- newValue_ = null;
- else if (!nillable && newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = nillable;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getServiceEndpointInterface();
- JavaClass newJavaClass_ = JavaRefFactory.eINSTANCE.createClassRef(newValue_);
- eObject_.setServiceEndpointInterface(newJavaClass_);
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (oldIsSet_)
- eObject_.eSet(feature_, oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.Command#execute()
- */
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
deleted file mode 100644
index 1688d32..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
+++ /dev/null
@@ -1,183 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandModifyServiceInterfaceText extends AbstractCommand {
- private ServiceRef eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private JavaClass oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyServiceInterfaceText(String label, String description, ServiceRef eObject, String newValue) {
- super(label, description);
- eObject_ = eObject;
- feature_ = Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface();
- if (newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = false;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getServiceInterface();
- eObject_.setServiceInterface(JavaRefFactory.eINSTANCE.createClassRef(newValue_));
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (oldIsSet_)
- eObject_.setServiceInterface(oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
deleted file mode 100644
index de6eb00..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
+++ /dev/null
@@ -1,181 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandModifyText extends AbstractCommand {
- private EObject eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private Object oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyText(String label, String description, EObject eObject, EStructuralFeature feature, String newValue, boolean nillable) {
- super(label, description);
- eObject_ = eObject;
- feature_ = feature;
- if (nillable && (newValue == null || newValue.length() <= 0))
- newValue_ = null;
- else if (!nillable && newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = nillable;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.eGet(feature_);
- eObject_.eSet(feature_, newValue_);
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (oldIsSet_)
- eObject_.eSet(feature_, oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
deleted file mode 100644
index 79893fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
+++ /dev/null
@@ -1,291 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-public class CommandMoveServiceRefs extends AbstractCommand {
- private EObject source_;
- private EObject target_;
- private EStructuralFeature childFeature_;
- private Object[] children_;
- private boolean isCopy_;
- private Object[] clonedChildren_;
- private EList serviceRefs;
-
- public CommandMoveServiceRefs(String label, String description, EObject source, EObject target, EStructuralFeature childFeature, Object[] children, boolean isCopy, EList serviceRefs) {
- super(label, description);
- source_ = source;
- target_ = target;
- childFeature_ = childFeature;
- children_ = children;
- isCopy_ = isCopy;
- clonedChildren_ = null;
- this.serviceRefs = serviceRefs;
- }
-
- private Object cloneObject(Object object) {
- if (object instanceof EList) {
- EList clone = new BasicEList();
- for (Iterator it = ((EList) object).iterator(); it.hasNext();) {
- clone.add(cloneObject(it.next()));
- }
- return clone;
- }
- if (object instanceof EObject) {
- EObject source = (EObject) object;
- EClass eClass = ((EObject) object).eClass();
- EPackage ePackage = eClass.getEPackage();
- EFactory eFactory = ePackage.getEFactoryInstance();
- EObject clone = eFactory.create(eClass);
- EList features = eClass.getEAllStructuralFeatures();
- for (Iterator it = features.iterator(); it.hasNext();) {
- EStructuralFeature feature = (EStructuralFeature) it.next();
- if (source.eIsSet(feature)) {
- Object clonedFeature = cloneObject(source.eGet(feature));
- if (feature.isMany())
- ((List) clone.eGet(feature)).addAll((List) clonedFeature);
- else
- clone.eSet(feature, clonedFeature);
- } else
- clone.eUnset(feature);
- }
- return clone;
- }
- if (object != null)
- return new String(object.toString());
- return null;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany())
- executeMany();
- else
- executeSingle();
- }
-
- private void executeSingle() {
- Object child = source_.eGet(childFeature_);
- if (isCopy_)
- target_.eSet(childFeature_, cloneObject(child));
- else {
- source_.eUnset(childFeature_);
- target_.eSet(childFeature_, child);
- }
- }
-
- private void executeMany() {
- EList sourceList;
- if (source_ instanceof WebServicesClient)
- sourceList = serviceRefs;
- else
- sourceList = (EList) source_.eGet(childFeature_);
- EList targetList;
- if (target_ instanceof WebServicesClient)
- targetList = serviceRefs;
- else
- targetList = (EList) target_.eGet(childFeature_);
- if (isCopy_)
- clonedChildren_ = new Object[children_.length];
- for (int i = 0; i < children_.length; i++) {
- int index = sourceList.indexOf(children_[i]);
- if (index != -1) {
- if (isCopy_) {
- clonedChildren_[i] = cloneObject(children_[i]);
- targetList.add(clonedChildren_[i]);
- } else {
- sourceList.remove(index);
- targetList.add(children_[i]);
- }
- }
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (childFeature_.isMany())
- undoSingle();
- else
- undoMany();
- }
-
- private void undoSingle() {
- Object child = target_.eGet(childFeature_);
- target_.eUnset(childFeature_);
- if (!isCopy_)
- source_.eSet(childFeature_, child);
- }
-
- private void undoMany() {
- EList sourceList;
- if (source_ instanceof WebServicesClient)
- sourceList = serviceRefs;
- else
- sourceList = (EList) source_.eGet(childFeature_);
- EList targetList;
- if (target_ instanceof WebServicesClient)
- targetList = serviceRefs;
- else
- targetList = (EList) target_.eGet(childFeature_);
- if (isCopy_) {
- if (clonedChildren_ != null) {
- for (int i = 0; i < clonedChildren_.length; i++) {
- targetList.remove(clonedChildren_[i]);
- }
- }
- } else {
- for (int i = 0; i < children_.length; i++) {
- int index = targetList.indexOf(children_[i]);
- if (index != -1) {
- targetList.remove(index);
- sourceList.add(children_[i]);
- }
- }
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
deleted file mode 100644
index 5206165..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
+++ /dev/null
@@ -1,200 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandRemoveElement extends AbstractCommand {
- private EObject parent_;
- private Object child_;
- private Object oldChild_;
- private boolean oldChildSet_;
- private EStructuralFeature childFeature_;
- private boolean nillable_;
-
- public CommandRemoveElement(String label, String description, EObject parent, EStructuralFeature childFeature) {
- this(label, description, parent, childFeature, true);
- }
-
- public CommandRemoveElement(String label, String description, EObject parent, EStructuralFeature childFeature, boolean nillable) {
- this(label, description, parent, null, childFeature, nillable);
- }
-
- public CommandRemoveElement(String label, String description, EObject parent, Object child, EStructuralFeature childFeature) {
- this(label, description, parent, child, childFeature, true);
- }
-
- public CommandRemoveElement(String label, String description, EObject parent, Object child, EStructuralFeature childFeature, boolean nillable) {
- super(label, description);
- parent_ = parent;
- child_ = child;
- oldChild_ = null;
- oldChildSet_ = true;
- childFeature_ = childFeature;
- nillable_ = nillable;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany()) {
- if (child_ != null)
- ((EList) parent_.eGet(childFeature_)).remove(child_);
- } else {
- oldChild_ = parent_.eGet(childFeature_);
- oldChildSet_ = parent_.eIsSet(childFeature_);
- if (nillable_)
- parent_.eUnset(childFeature_);
- else
- parent_.eSet(childFeature_, null);
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (childFeature_.isMany()) {
- if (child_ != null)
- ((EList) parent_.eGet(childFeature_)).add(child_);
- } else {
- if (oldChildSet_)
- parent_.eSet(childFeature_, oldChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
deleted file mode 100644
index 46cec0c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
+++ /dev/null
@@ -1,198 +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.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandSetElement extends AbstractCommand {
- private EObject parent_;
- private EStructuralFeature childFeature_;
- private Object newChild_;
- private Object oldChild_;
- private boolean oldChildSet_;
-
- public CommandSetElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild) {
- this(label, description, parent, childFeature, newChild, null);
- }
-
- public CommandSetElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild, Object oldChild) {
- super(label, description);
- parent_ = parent;
- childFeature_ = childFeature;
- newChild_ = newChild;
- oldChild_ = oldChild;
- oldChildSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany() && !(newChild_ instanceof EList)) {
- if (oldChild_ != null && newChild_ != null) {
- EList eList = (EList) parent_.eGet(childFeature_);
- int index = eList.indexOf(oldChild_);
- if (index != -1)
- eList.set(index, newChild_);
- }
- } else {
- oldChild_ = parent_.eGet(childFeature_);
- oldChildSet_ = parent_.eIsSet(childFeature_);
- if (newChild_ != null)
- parent_.eSet(childFeature_, newChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- public void undo() {
- if (childFeature_.isMany() && !(newChild_ instanceof EList)) {
- if (oldChild_ != null && newChild_ != null) {
- EList eList = (EList) parent_.eGet(childFeature_);
- int index = eList.indexOf(newChild_);
- if (index != -1)
- eList.set(index, oldChild_);
- }
- } else {
- if (oldChildSet_)
- parent_.eSet(childFeature_, oldChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java
deleted file mode 100644
index da5c99c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResource;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data from a
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource} which stores the metamodel. The
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource} is retrieved from the
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using a constant {@see
- * J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods extract data or manipulate the contents of
- * the underlying resource.
- * </p>
- *
- */
-public class JaxRPCMapArtifactEdit extends EnterpriseArtifactEdit {
-
- /**
- * <p>
- * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
- * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = JaxRPCMapArtifactEdit.class;
-
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public JaxRPCMapArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- // TODO Auto-generated constructor stub
- }
-
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public JaxRPCMapArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from the given
- * {@see ModuleCoreNature}
- */
- protected JaxRPCMapArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- *
- * @return WsddResource from (@link getDeploymentDescriptorResource())
- *
- */
-
- public JaxrpcmapResource getJaxRPCMapXmiResource(String mappingFilePathURI) {
-
- URI uri = URI.createPlatformResourceURI(mappingFilePathURI);
- ResourceSet resSet = getArtifactEditModel().getResourceSet();
- WTPResourceFactoryRegistry registry = (WTPResourceFactoryRegistry) resSet.getResourceFactoryRegistry();
- registry.registerLastFileSegment(uri.lastSegment(), new JaxrpcmapResourceFactory(RendererFactory.getDefaultRendererFactory()));
-
- JaxrpcmapResource jaxrpcmapRes = (JaxrpcmapResource) resSet.getResource(uri, true);
-
- return jaxrpcmapRes;
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from EJBResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- *
- */
-
- public int getJ2EEVersion(String mappingFilePathURI) {
- return getJaxRPCMapXmiResource(mappingFilePathURI).getJ2EEVersionID();
- }
-
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
- * </p>
- *
- * @return Resource
- *
- */
-
- public Resource getDeploymentDescriptorResource(String mappingFilePathURI) {
- return getJaxRPCMapXmiResource(mappingFilePathURI);
- }
-
-
- /**
- *
- * @return WebServices from (@link getDeploymentDescriptorRoot())
- *
- */
- public JavaWSDLMapping getJavaWSDLMapping() {
- return (JavaWSDLMapping) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Obtains the WebServices (@see WebServices) root object from the WsddResource. If the root object does
- * not exist, then one is created (@link addEJBJarIfNecessary(getEJBJarXmiResource())).
- * The root object contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- *
- */
- public EObject getDeploymentDescriptorRoot(String mappingFilePathURI) {
- List contents = getDeploymentDescriptorResource(mappingFilePathURI).getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addJavaWSDLMappingIfNecessary(getJaxRPCMapXmiResource(mappingFilePathURI));
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebServices) and populates with data. Adds the root
- * object to the deployment descriptor resource.
- * </p>
- *
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource}
- * Note: This method is typically used for JUNIT - move?
- * </p>
- */
- protected void addJavaWSDLMappingIfNecessary(JaxrpcmapResource aResource) {
- if (aResource != null) {
- if(aResource.getContents() == null || aResource.getContents().isEmpty()) {
- JavaWSDLMapping map = JaxrpcmapFactory.eINSTANCE.createJavaWSDLMapping();
- aResource.getContents().add(map);
- }
- aResource.getContents().get(0);
- getArtifactEditModel().getModuleURI();
- try {
- aResource.saveIfNecessary();
- }
- catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForRead(IProject aProject) {
- JaxRPCMapArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new JaxRPCMapArtifactEdit(aProject, true);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForWrite(IProject aProject) {
- JaxRPCMapArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new JaxRPCMapArtifactEdit(aProject, false);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific {@see WorkbenchComponent} that will not
- * be used for editing. Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of WSDDArtifactEdit that may only be used to read the underlying content
- * model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForRead(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- return new JaxRPCMapArtifactEdit(nature, aModule, true);
- }
-
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of WSDDArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForWrite(IVirtualComponent aModule) {
-
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- return new JaxRPCMapArtifactEdit(nature, aModule, false);
-
- }
-
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidEJBModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isEJBProject(aComponent.getProject());
- }
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isDynamicWebProject(aComponent.getProject());
- }
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isApplicationClientProject(aComponent.getProject());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- public EObject createModelRoot(String mappingFilePathURI) {
- return createModelRoot(getJ2EEVersion(),mappingFilePathURI);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- public EObject createModelRoot(int version,String mappingFilePathURI) {
- JaxrpcmapResource res = getJaxRPCMapXmiResource(mappingFilePathURI);
- res.setModuleVersionID(version);
- addJavaWSDLMappingIfNecessary(res);
- return getJavaWSDLMapping();
- }
-
- public EObject createModelRoot() {
- throw new IllegalArgumentException("Mapping file name unknown");
- }
-
- public EObject createModelRoot(int version) {
- throw new IllegalArgumentException("Mapping file name unknown");
- }
-
- public Resource getDeploymentDescriptorResource() {
- throw new IllegalArgumentException("Mapping file name unknown");
- }
-
- public int getJ2EEVersion() {
- throw new IllegalArgumentException("Mapping file name unknown");
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java
deleted file mode 100644
index faac06d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data
- * from a {@see org.eclipse.jst.j2ee.ejb.EJBResource} which stores the
- * metamodel. The {@see org.eclipse.jst.j2ee.ejb.EJBResource} is retrieved
- * from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using
- * a constant {@see J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods
- * extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-public class WSCDDArtifactEdit extends EnterpriseArtifactEdit {
-
- /**
- * <p>
- * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
- * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = WSCDDArtifactEdit.class;
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WSCDDArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public WSCDDArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from
- * the given {@see ModuleCoreNature}
- */
- public WSCDDArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * @return WsddResource from (@link getDeploymentDescriptorResource())
- */
-
- public WebServicesResource getWscddXmiResource() {
- return (WebServicesResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from EJBResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- */
-
- public int getJ2EEVersion() {
- return getWscddXmiResource().getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using
- * defined URI.
- * </p>
- *
- * @return Resource
- */
-
- public Resource getDeploymentDescriptorResource() {
- return getArtifactEditModel().getResource(getWebServicesClientXmlResourceURI());
- }
-
- public URI getWebServicesClientXmlResourceURI() {
-
- URI resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_WEB_INF_DD_URI_OBJ;
- if (isValidAppClientModule(ComponentCore.createComponent(getProject())))
- resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ;
- else if (isValidEJBModule(ComponentCore.createComponent(getProject())))
- resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ; //$NON-NLS-1$
- return resourceURI;
- }
-
- /**
- * @return WebServices from (@link getDeploymentDescriptorRoot())
- */
- public WebServicesClient getWebServicesClient() {
- return (WebServicesClient) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Obtains the WebServices (@see WebServices) root object from the
- * WsddResource. If the root object does not exist, then one is created
- * (@link addEJBJarIfNecessary(getEJBJarXmiResource())). The root object
- * contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- */
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addWebServicesClientIfNecessary(getWscddXmiResource());
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebServices) and populates
- * with data. Adds the root object to the deployment descriptor resource.
- * </p>
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource} Note: This method
- * is typically used for JUNIT - move?
- * </p>
- */
- protected void addWebServicesClientIfNecessary(WebServicesResource aResource) {
- if (aResource != null) {
- if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
- WebServicesClient ws_client = Webservice_clientFactory.eINSTANCE.createWebServicesClient();
- aResource.getContents().add(ws_client);
- }
- aResource.getContents().get(0);
- getArtifactEditModel().getModuleURI();
- try {
- aResource.saveIfNecessary();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the
- * underlying content model
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForRead(IProject aProject) {
- WSCDDArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new WSCDDArtifactEdit(aProject, true);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForWrite(IProject aProject) {
- WSCDDArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new WSCDDArtifactEdit(aProject, false);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may only be used to read the
- * underlying content model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForRead(IVirtualComponent aModule) {
-
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (aModule != null && isValidWSCDDModule(aModule))
- return new WSCDDArtifactEdit(nature, aModule, true);
- return null;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForWrite(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (aModule != null && isValidWSCDDModule(aModule))
- return new WSCDDArtifactEdit(nature, aModule, false);
- return null;
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidEJBModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isEJBProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidWSDDModule(IVirtualComponent)}and the
- * moduleTypeId is a JST module
- */
- protected static boolean isValidWSCDDModule(IVirtualComponent aComponent) {
- return (isValidAppClientModule(aComponent) || isValidWebModule(aComponent) || isValidEJBModule(aComponent));
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isDynamicWebProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isApplicationClientProject(aComponent.getProject());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- public EObject createModelRoot(int version) {
- WebServicesResource res = getWscddXmiResource();
- res.setModuleVersionID(version);
- addWebServicesClientIfNecessary(res);
- return getWebServicesClient();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java
deleted file mode 100644
index 9adcc7b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data
- * from a {@see org.eclipse.jst.j2ee.ejb.EJBResource} which stores the
- * metamodel. The {@see org.eclipse.jst.j2ee.ejb.EJBResource} is retrieved
- * from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using
- * a constant {@see J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods
- * extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-public class WSDDArtifactEdit extends EnterpriseArtifactEdit {
-
- /**
- * <p>
- * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
- * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = WSDDArtifactEdit.class;
-
- public static final String WSIL_FILE_EXT = "wsil"; //$NON-NLS-1$
-
- public static final String WSDL_FILE_EXT = "wsdl"; //$NON-NLS-1$
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WSDDArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public WSDDArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from
- * the given {@see ModuleCoreNature}
- */
- public WSDDArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * @return WsddResource from (@link getDeploymentDescriptorResource())
- */
-
- public WsddResource getWsddXmiResource() {
- return (WsddResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from EJBResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- */
-
- public int getJ2EEVersion() {
- return getWsddXmiResource().getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using
- * defined URI.
- * </p>
- *
- * @return Resource
- */
-
- public Resource getDeploymentDescriptorResource() {
- return getArtifactEditModel().getResource(getWebServicesXmlResourceURI());
- }
-
- public URI getWebServicesXmlResourceURI() {
-
- URI resourceURI = J2EEConstants.WEB_SERVICES_WEB_INF_DD_URI_OBJ;
- if (isValidAppClientModule(getComponent()))
- resourceURI = J2EEConstants.WEB_SERVICES_META_INF_DD_URI_OBJ;
- else if (isValidEJBModule(getComponent()))
- resourceURI = J2EEConstants.WEB_SERVICES_META_INF_DD_URI_OBJ; //$NON-NLS-1$
- return resourceURI;
- }
-
- /**
- * @return WebServices from (@link getDeploymentDescriptorRoot())
- */
- public WebServices getWebServices() {
- if (!getProject().isAccessible())
- return null;
- if (getWsddXmiResource().getContents().isEmpty())
- return null;
- return (WebServices) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Obtains the WebServices (@see WebServices) root object from the
- * WsddResource. If the root object does not exist, then one is created
- * (@link addEJBJarIfNecessary(getEJBJarXmiResource())). The root object
- * contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- */
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addWebServicesIfNecessary(getWsddXmiResource());
- if (contents.isEmpty())
- return null;
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebServices) and populates
- * with data. Adds the root object to the deployment descriptor resource.
- * </p>
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource} Note: This method
- * is typically used for JUNIT - move?
- * </p>
- */
- protected void addWebServicesIfNecessary(WsddResource aResource) {
- if (aResource != null) {
- if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
- WebServices ws = WsddFactory.eINSTANCE.createWebServices();
- aResource.getContents().add(ws);
- }
- aResource.getContents().get(0);
- getArtifactEditModel().getModuleURI();
- try {
- aResource.saveIfNecessary();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the
- * underlying content model
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForRead(IProject aProject) {
- WSDDArtifactEdit artifactEdit = null;
- IVirtualComponent comp = ComponentCore.createComponent(aProject);
- if (comp != null && isValidWSDDModule(comp)) {
- try {
- artifactEdit = new WSDDArtifactEdit(aProject, true);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForWrite(IProject aProject) {
- WSDDArtifactEdit artifactEdit = null;
- IVirtualComponent comp = ComponentCore.createComponent(aProject);
- if (comp != null && isValidWSDDModule(comp)) {
- try {
- artifactEdit = new WSDDArtifactEdit(aProject, false);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may only be used to read the
- * underlying content model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForRead(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (aModule != null && isValidWSDDModule(aModule))
- return new WSDDArtifactEdit(nature, aModule, true);
- return null;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForWrite(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (aModule != null && isValidWSDDModule(aModule))
- return new WSDDArtifactEdit(nature, aModule, false);
- return null;
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidEJBModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isEJBProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidWSDDModule(IVirtualComponent)}and the
- * moduleTypeId is a JST module
- */
- protected static boolean isValidWSDDModule(IVirtualComponent aComponent) {
- return (isValidAppClientModule(aComponent) || isValidWebModule(aComponent) || isValidEJBModule(aComponent));
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isDynamicWebProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
- return J2EEProjectUtilities.isApplicationClientProject(aComponent.getProject());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- public EObject createModelRoot(int version) {
- WsddResource res = (WsddResource) getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addWebServicesIfNecessary(res);
- return getWebServices();
- }
-
- public EObject getContentModelRoot() {
- return getWebServices();
- }
-
- public List getWSILResources() {
- List result = new ArrayList();
- List files = ProjectUtilities.getAllProjectFiles(getProject());
- for (int i = 0; i < files.size(); i++) {
- IFile file = (IFile) files.get(i);
- if (file.getFileExtension() != null && file.getFileExtension().equals(WSIL_FILE_EXT)) {
- IVirtualResource[] vResources = ComponentCore.createResources(file);
- if (vResources.length > 0 && !result.contains(file))
- result.add(file);
- }
- }
- return result;
- }
-
- public List getWSDLResources() {
- return getResources(WSDL_FILE_EXT);
- }
-
- private List getResources(String ext) {
- List resources = getArtifactEditModel().getResources();
- List result = new ArrayList();
- for (int i = 0; i < resources.size(); i++) {
- Resource res = (Resource) resources.get(i);
- if (res != null && res.getURI().fileExtension() != null && res.getURI().fileExtension().equals(ext))
- result.add(res);
- }
- return result;
- }
-
- /**
- * return the WSDLResource if it exists, otherwise return null
- */
- public Resource getWsdlResource(String path) {
- if (path == null || path.equals(""))return null; //$NON-NLS-1$
- Resource res = null;
- try {
- res = getArtifactEditModel().getResource(URI.createURI(path));
- } catch (Exception e) {
- // Ignore
- }
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (res != null && res.isLoaded() && serviceHelper.isWSDLResource(res))
- return res;
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java
deleted file mode 100644
index 0101578..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java
+++ /dev/null
@@ -1,146 +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.jst.j2ee.internal.webservice.constants;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-
-public class ATKUIConstants {
- // init-param
- public String defaultInitParamName() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_NAME")); //$NON-NLS-1$
- }
-
- public String defaultInitParamValue() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_VALUE")); //$NON-NLS-1$
- }
-
- public String defaultDescription() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_DESCRIPTION")); //$NON-NLS-1$
- }
-
- // QName
- private String DEFAULT_PREFIX = "pfx"; //$NON-NLS-1$
- private String DEFAULT_NAMESPACEURI = "NamespaceURI"; //$NON-NLS-1$
- private String DEFAULT_LOCALPART = "LocalPart"; //$NON-NLS-1$
-
- public String defaultPrefix() {
- return new String(DEFAULT_PREFIX);
- }
-
- public String defaultNamespaceURI() {
- return new String(DEFAULT_NAMESPACEURI);
- }
-
- public String defaultLocalPart() {
- return new String(DEFAULT_LOCALPART);
- }
-
- // soap role
- public String defaultSOAPRole() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_SOAP_ROLE")); //$NON-NLS-1$
- }
-
- // port name
- public String defaultPortName() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_PORT_NAME")); //$NON-NLS-1$
- }
-
- //port component
- public String defaultServiceEndpointInterface() {
- return new String("java.rmi.Remote"); //$NON-NLS-1$
- }
-
-
- // port component ref
- public JavaClass defaultClientServiceEndpointInterface() {
- return JavaRefFactory.eINSTANCE.createClassRef("java.rmi.Remote"); //$NON-NLS-1$
- }
-
- public String defaultPortComponentLink() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_PORT_COMPONENT_LINK")); //$NON-NLS-1$
- }
-
- // service-ref
- public ServiceRef defaultServiceRef() {
- ServiceRef serviceRef = Webservice_clientFactory.eINSTANCE.createServiceRef();
- serviceRef.setServiceRefName(defaultServiceRefName());
- serviceRef.setServiceInterface(defaultServiceInterface());
- return serviceRef;
- }
-
- public String defaultServiceRefName() {
- StringBuffer sb = new StringBuffer("service/"); //$NON-NLS-1$
- sb.append(WebServicePlugin.getMessage("%_UI_ServiceRef_type")); //$NON-NLS-1$
- return sb.toString();
- }
-
- public JavaClass defaultServiceInterface() {
- return JavaRefFactory.eINSTANCE.createClassRef("javax.xml.rpc.Service"); //$NON-NLS-1$
- }
-
- // port component name
- public String defaultPortComponentName() {
- return new String(WebServicePlugin.getMessage("%_UI_PortComponent_type")); //$NON-NLS-1$
- }
-
- // service impl bean
- public ServiceImplBean defaultServiceImplBean() {
- ServiceImplBean serviceImplBean = WsddFactory.eINSTANCE.createServiceImplBean();
- serviceImplBean.setEServletLink(defaultServletLink());
- return serviceImplBean;
- }
-
- // servlet link
- public ServletLink defaultServletLink() {
- ServletLink servletLink = WsddFactory.eINSTANCE.createServletLink();
- servletLink.setServletLink(WebServicePlugin.getMessage("%LABEL_SERVLET_LINK")); //$NON-NLS-1$
- return servletLink;
- }
-
- // WSDL port
- public WSDLPort defaultWSDLPort(int versionID) {
- WSDLPort wsdlport = WsddFactory.eINSTANCE.createWSDLPort();
- QNameHelper.setQNameValue(wsdlport, defaultNamespaceURI(), defaultLocalPart(), defaultPrefix(), versionID);
- return wsdlport;
- }
-
- // port component
- public PortComponent defaultPortComponent(int versionID) {
- PortComponent portComponent = WsddFactory.eINSTANCE.createPortComponent();
- portComponent.setPortComponentName(defaultPortComponentName());
- portComponent.setWsdlPort(defaultWSDLPort(versionID));
- portComponent.setServiceEndpointInterface(defaultServiceEndpointInterface());
- portComponent.setServiceImplBean(defaultServiceImplBean());
- return portComponent;
- }
-
- // JAX RPC mapping
- public String defaultJaxRpcMappingFile() {
- return new String("jaxrpcmapping.xml"); //$NON-NLS-1$
- }
-
- // component scoped reference
- public String defaultComponentName() {
- return new String(WebServicePlugin.getMessage("%_UI_PortComponentRef_type")); //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java
deleted file mode 100644
index f5207c3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java
+++ /dev/null
@@ -1,249 +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.jst.j2ee.internal.webservice.constants;
-
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-public class InfopopConstants {
-
- /** *************************Infopops for pages************************ */
- public String getInfopopWebServicesPage() {
- return WebServicePlugin.PLUGIN_ID + ".EJSRP0001"; //$NON-NLS-1$
- }
-
- public String getInfopopPortComponentPage() {
- return WebServicePlugin.PLUGIN_ID + ".EJSRP0002"; //$NON-NLS-1$
- }
-
- public String getInfopopWSHandlerPage() {
- return WebServicePlugin.PLUGIN_ID + ".EJSRP0003"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceRefPage() {
- return WebServicePlugin.PLUGIN_ID + ".EJSRP0004"; //$NON-NLS-1$
- }
-
- public String getInfopopSRHandlerPage() {
- return WebServicePlugin.PLUGIN_ID + ".EJSRP0005"; //$NON-NLS-1$
- }
-
-
-
- /** *************************Infopops for sections*********************** */
- public String getInfopopDescription() {
- /* CONTEXT_ID EJSR0001 for the description text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0001"; //$NON-NLS-1$
- }
-
- public String getInfopopDisplayName() {
- /* CONTEXT_ID EJSR0002 for the display name text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0002"; //$NON-NLS-1$
- }
-
- public String getInfopopSmallIcon() {
- /* CONTEXT_ID EJSR0003 for the small icon display */
- return WebServicePlugin.PLUGIN_ID + "EJSR0003"; //$NON-NLS-1$
- }
-
- public String getInfopopLargeIcon() {
- /* CONTEXT_ID EJSR0004 for the large icon display */
- return WebServicePlugin.PLUGIN_ID + "EJSR0004"; //$NON-NLS-1$
- }
-
- public String getInfopopWebServiceDescriptionName() {
- /* CONTEXT_ID EJSR0005 for the Web service description name text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0005"; //$NON-NLS-1$
- }
-
- public String getInfopopWSDLFile() {
- /* CONTEXT_ID EJSR0006 for the WSDL file location text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0006"; //$NON-NLS-1$
- }
-
- public String getInfopopJAXRPCMappingFile() {
- /* CONTEXT_ID EJSR0007 for the JAX-RPC mapping file location text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0007"; //$NON-NLS-1$
- }
-
- public String getInfopopPortComponentName() {
- /* CONTEXT_ID EJSR0008 for the port component name text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0008"; //$NON-NLS-1$
- }
-
- public String getInfopopWSDLPortNamespaceURI() {
- /* CONTEXT_ID EJSR0009 for the WSDL port namespace URI text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0009"; //$NON-NLS-1$
- }
-
- public String getInfopopWSDLPortLocalpart() {
- /* CONTEXT_ID EJSR0010 for the WSDL port local part text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0010"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceEndpointInterface() {
- /*
- * CONTEXT_ID EJSR0011 for the fully qualified service endpoint interface class name text
- * field
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0011"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceImplBean() {
- /*
- * CONTEXT_ID EJSR0012 for the fully qualified service implementation bean class name text
- * field
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0012"; //$NON-NLS-1$
- }
-
- public String getInfopopEJBLink() {
- /* CONTEXT_ID EJSR0013 for the use EJB link radio button */
- return WebServicePlugin.PLUGIN_ID + "EJSR0013"; //$NON-NLS-1$
- }
-
- public String getInfopopServletLink() {
- /* CONTEXT_ID EJSR0014 for the use servlet link radio button */
- return WebServicePlugin.PLUGIN_ID + "EJSR0014"; //$NON-NLS-1$
- }
-
- public String getInfopopHandlerName() {
- /* CONTEXT_ID EJSR0015 for the handler name text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0015"; //$NON-NLS-1$
- }
-
- public String getInfopopHandlerClass() {
- /* CONTEXT_ID EJSR0016 for the fully qualified handler class name text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0016"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceRefName() {
- /* CONTEXT_ID EJSR0017 for the service reference name text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0017"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceInterfaceName() {
- /* CONTEXT_ID EJSR0018 for the service interface name text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0018"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceQNameNamespaceURI() {
- /* CONTEXT_ID EJSR0019 for the service qname namspace URI text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0019"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceQNameLocalpart() {
- /* CONTEXT_ID EJSR0020 for the service qname local part text field */
- return WebServicePlugin.PLUGIN_ID + "EJSR0020"; //$NON-NLS-1$
- }
-
- public String getInfopopComboWebServiceDescription() {
- /*
- * CONTEXT_ID EJSR0021 for the Web service description drop-down (list of Web service
- * descriptions)
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0021"; //$NON-NLS-1$
- }
-
- public String getInfopopComboPortComponent() {
- /* CONTEXT_ID EJSR0022 for the port component drop-down (list of port components) */
- return WebServicePlugin.PLUGIN_ID + "EJSR0022"; //$NON-NLS-1$
- }
-
- public String getInfopopComboComponentScopedRef() {
- /*
- * CONTEXT_ID EJSR0023 for the component scoped reference drop-down (list of component
- * scoped reference)
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0023"; //$NON-NLS-1$
- }
-
- public String getInfopopComboServiceRef() {
- /* CONTEXT_ID EJSR0024 for the service reference drop-down (list of service references) */
- return WebServicePlugin.PLUGIN_ID + "EJSR0024"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionWebServiceDescription() {
- /* CONTEXT_ID EJSR0025 for the Web service description section in the webservices.xml editor */
- return WebServicePlugin.PLUGIN_ID + "EJSR0025"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionPortComponent() {
- /* CONTEXT_ID EJSR0026 for the port component section in the webservices.xml editor */
- return WebServicePlugin.PLUGIN_ID + "EJSR0026"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionHandlerWS() {
- /* CONTEXT_ID EJSR0027 for the handler section in the webservices.xml editor */
- return WebServicePlugin.PLUGIN_ID + "EJSR0027"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionComponentScopedRef() {
- /*
- * CONTEXT_ID EJSR0028 for the component scoped reference section in the
- * webservicesclient.xml editor
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0028"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionServiceRef() {
- /* CONTEXT_ID EJSR0029 for the service reference section in the webservicesclient.xml editor */
- return WebServicePlugin.PLUGIN_ID + "EJSR0029"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionPortComponentRef() {
- /*
- * CONTEXT_ID EJSR0030 for the port component reference section in the webservicesclient.xml
- * editor
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0030"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionHandlerWSC() {
- /* CONTEXT_ID EJSR0031 for the handler section in the webservicesclient.xml editor */
- return WebServicePlugin.PLUGIN_ID + "EJSR0031"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionInitParams() {
- /*
- * CONTEXT_ID EJSR0032 for the initial parameter section in both webservices.xml and
- * webservicesclient.xml editor
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0032"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionSOAPHeaders() {
- /*
- * CONTEXT_ID EJSR0033 for the SOAP header section in both webservices.xml and
- * webservicesclient.xml editor
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0033"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionSOAPRoles() {
- /*
- * CONTEXT_ID EJSR0034 for the SOAP role section in both webservices.xml and
- * webservicesclient.xml editor
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0034"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionPortNames() {
- /* CONTEXT_ID EJSR0035 for the port name section in the webservicesclient.xml editor */
- return WebServicePlugin.PLUGIN_ID + "EJSR0035"; //$NON-NLS-1$
- }
-
- public String getInfopopResourceTree() {
- /*
- * CONTEXT_ID EJSR0036 for the popup dialog that allows the user to select a resource in the
- * workbench
- */
- return WebServicePlugin.PLUGIN_ID + "EJSR0036"; //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java
deleted file mode 100644
index d05b17c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java
+++ /dev/null
@@ -1,358 +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.jst.j2ee.internal.webservice.helper;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * This class contains methods to help navigate WSDL files provided in various JSR-109 descriptors
- */
-public class WSDLHelper {
-
- private IProject proj;
-
- public WSDLHelper(IProject aProject) {
- this.proj = aProject;
- }
-
- /**
- * This method returns the list of wsdl:port@name's contained in the WSDL file referred to by
- * the specified <service-ref>
- *
- * @param serviceRefName
- * The name of the <service-ref>
- * @param compScopedRefName
- * The name of the <component-scoped-refs>
- * @param wsc
- * The root object of the webservicesclient.xml descriptor
- * @param exclude
- * port names to exclude in the returned array
- * @return String[] An array of wsdl:port@names's. null is returned if there are any problems
- * with navigating the webservicesclient.xml or the WSDL.
- */
- public String[] getPortNames(String serviceRefName, String compScopedRefName, WebServicesClient wsc, String[] exclude) {
- ServiceRef sr = getServiceRef(serviceRefName, compScopedRefName, wsc);
- if (sr == null)
- return null;
-
- String wsdlURL = getWSDLFileURL(sr);
- if (wsdlURL.length() == 0)
- return null;
-
- String serviceLocalName = getServiceQname(sr);
- String[] portNames = getPortNames(wsdlURL, serviceLocalName);
- portNames = trim(portNames, exclude);
- return portNames;
-
- }
-
- /**
- * This method returns the namespace of the wsdl:service in WSDL file referred to by the
- * specified <service-ref>
- *
- * @param serviceRefName
- * The name of the <service-ref>
- * @param compScopedRefName
- * The name of the <component-scoped-refs>
- * @param wsc
- * The root object of the webservicesclient.xml descriptor
- * @param exclude
- * port names to exclude in the returned array
- * @return String The namespace of the wsdl:service. null is returned if there are any problems
- * with navigating the webservicesclient.xml or the WSDL.
- */
- public String getPortNamespace(String serviceRefName, String compScopedRefName, WebServicesClient wsc) {
- ServiceRef sr = getServiceRef(serviceRefName, compScopedRefName, wsc);
- if (sr == null)
- return null;
-
- String wsdlURL = getWSDLFileURL(sr);
- if (wsdlURL.length() == 0)
- return ""; //$NON-NLS-1$
-
- String serviceLocalName = getServiceQname(sr);
- String namespace = getPortNamespace(wsdlURL, serviceLocalName);
- return namespace;
- }
-
- /**
- * This method returns the list of wsdl:port@name's contained in the specified wsdl:service in
- * the specified WSDL file.
- *
- * @param wsdlURL
- * The URL of the WSDL file.
- * @param serviceLocalName
- * The local name of the wsdl:service to look in.
- * @return String[] An array of wsdl:port@name's. Null is returned a wsdl:service with the
- * specified local name could not be found.
- */
- private String[] getPortNames(String wsdlURL, String serviceLocalName) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- Object targetService = getTargetService(wsdlURL, serviceLocalName);
-
- if (targetService == null) {
- //System.out.println("getPortNames ... targetService null.");
- return null;
- }
-
- Map ports = serviceHelper.getServicePorts(targetService);
- int numberOfPorts = ports.size();
- String[] portNames = new String[numberOfPorts];
- Iterator k = ports.values().iterator();
- for (int m = 0; m < numberOfPorts; m++) {
- Object port = k.next();
- portNames[m] = serviceHelper.getPortName(port);
- }
-
- return portNames;
- }
-
- /**
- * This method returns the namespace of the specified wsdl:service in the specified WSDL file.
- *
- * @param wsdlURL
- * The URL of the WSDL file.
- * @param serviceLocalName
- * The local name of the wsdl:service to look in.
- * @return String[] An array of wsdl:port@name's. An empty String is returned if a wsdl:service
- * with the specified local name could not be found.
- */
- private String getPortNamespace(String wsdlURL, String serviceLocalName) {
- Object targetService = getTargetService(wsdlURL, serviceLocalName);
-
- if (targetService == null) {
- //System.out.println("getPortNamespace ... targetService null.");
- return ""; //$NON-NLS-1$
- }
-
- return WSDLServiceExtManager.getServiceHelper().getServiceNamespaceURI(targetService);
- }
-
- private Object getTargetService(String wsdlURL, String serviceLocalName) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- Object definition = getWSDLDefinition(wsdlURL);
- if (definition == null) {
- return null;
- }
-
- Object targetService = null;
- Map services = serviceHelper.getDefinitionServices(definition);
- if (!services.isEmpty()) {
- if ((serviceLocalName == null || serviceLocalName.length() == 0) && services.size() > 1) //Multiple
- // services
- // without
- // one
- // designated
- // is
- // an
- // error
- {
- return null;
- }
-
- if ((serviceLocalName == null || serviceLocalName.length() == 0) && services.size() == 1) {
- //Return the port names in the one service
- Iterator i = services.values().iterator();
- targetService = i.next();
- } else //There are multiple services but one is designated
- {
- Iterator j = services.values().iterator();
- while (j.hasNext()) {
- Object service = j.next();
- String serviceName = serviceHelper.getServiceLocalPart(service);
- if (serviceName.equals(serviceLocalName)) {
- targetService = service;
- break; //Found a match. Break out of loop. We must be assuming unique names
- // on services.
- }
- }
- }
- }
-
- return targetService;
-
- }
-
-
- private Object getWSDLDefinition(String wsdlURL) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- return serviceHelper.getWSDLDefinition(wsdlURL);
-
- /*try {
- WSDLResourceImpl res = (WSDLResourceImpl) WorkbenchResourceHelperBase.getResource(URI.createURI(wsdlURL), true);
- if (res == null)
- return null;
- return res.getDefinition();
- } catch (Exception wsdle) {
- return null;
- }*/
- }
-
- /**
- * Returns the file URL of the <wsdl-file>specified in the given <service-ref>. Returns a blank
- * String if <wsdl-file>is not specified in the provided <service-ref>
- */
- private String getWSDLFileURL(ServiceRef sr) {
- String wsdlFileRelPath = sr.getWsdlFile();
- if (wsdlFileRelPath == null || wsdlFileRelPath.length() == 0)
- return ""; //$NON-NLS-1$
-
- // Get a handle on the WSDL file.
- IVirtualComponent component = ComponentCore.createComponent(proj);
- if (component != null) {
- IVirtualFolder moduleRoot = component.getRootFolder().getFolder("/"); //$NON-NLS-1$
- IFile wsdlFile = moduleRoot.getFile(wsdlFileRelPath).getUnderlyingFile();
- if (!wsdlFile.exists()) {
- return ""; //$NON-NLS-1$
- }
- //Get the fileURL from wsdlFile
- String wsdlURL;
- try {
- wsdlURL = wsdlFile.getLocation().toFile().toURL().toString();
- } catch (MalformedURLException murle) {
- return ""; //$NON-NLS-1$
- }
-
- if (wsdlURL == null || wsdlURL.length() == 0)
- return ""; //$NON-NLS-1$
- return wsdlURL;
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Returns the local part of the <service-qname>specified in the given <service-ref>. Returns a
- * blank String if <service-qname>is not specified in the provided <service-ref>
- */
- private String getServiceQname(ServiceRef sr) {
- QName serviceQname = sr.getServiceQname();
- if (serviceQname == null)
- return ""; //$NON-NLS-1$
-
- String serviceLocalName = serviceQname.getLocalPart();
- if (serviceLocalName == null)
- return ""; //$NON-NLS-1$
-
- return serviceLocalName;
- }
-
- /* If compScopedRefName is empty or null, we may have to check all of them. */
- public ServiceRef getServiceRef(String name, String compScopedRefName, WebServicesClient wsc) {
- Iterator serviceRefs;
- if (compScopedRefName != null && compScopedRefName.length() > 0) {
- ComponentScopedRefs csr = getCompScopedRef(compScopedRefName, wsc);
- serviceRefs = csr.getServiceRefs().iterator();
- } else {
- serviceRefs = wsc.getServiceRefs().iterator();
- //If there are no service refs ... check all component-scoped-refs for the service-ref
- if (!serviceRefs.hasNext()) {
- Iterator csRefs = wsc.getComponentScopedRefs().iterator();
-
- while (csRefs.hasNext()) {
- ComponentScopedRefs csr = (ComponentScopedRefs) csRefs.next();
- Iterator srs = csr.getServiceRefs().iterator();
- while (srs.hasNext()) {
- ServiceRef sr = (ServiceRef) srs.next();
- String thisName = sr.getServiceRefName();
- if (thisName.equals(name)) {
- return sr;
- }
- }
- }
-
- return null; //Could not find it in any of the component-scoped-refs
- }
-
- }
-
- while (serviceRefs.hasNext()) {
- ServiceRef serviceRef = (ServiceRef) serviceRefs.next();
- String serviceRefName = serviceRef.getServiceRefName();
- if (serviceRefName.equals(name))
- return serviceRef;
- }
- return null;
- }
-
-
- private ComponentScopedRefs getCompScopedRef(String name, WebServicesClient wsc) {
- Iterator compScopedRefs = wsc.getComponentScopedRefs().iterator();
- while (compScopedRefs.hasNext()) {
- ComponentScopedRefs compScopedRef = (ComponentScopedRefs) compScopedRefs.next();
- String compScopedRefName = compScopedRef.getComponentName();
- if (compScopedRefName.equals(name))
- return compScopedRef;
- }
- return null;
-
- }
-
-
- private String[] trim(String[] values, String[] exclude) {
- if (values == null || values.length == 0 || exclude == null || exclude.length == 0) //no
- // change
- // required.
- // return
- // as
- // is.
- return values;
-
- String[] finalValues;
- ArrayList finalList = new ArrayList();
- for (int i = 0; i < values.length; i++) {
- if (!contains(exclude, values[i])) {
- finalList.add(values[i]);
- }
- }
-
- int finalSize = finalList.size();
- finalValues = new String[finalSize];
- Object[] finalArray = finalList.toArray();
- for (int j = 0; j < finalSize; j++) {
- finalValues[j] = (String) (finalArray[j]);
- }
-
- return finalValues;
-
- }
-
- /**
- * Returns true if the array of String's contains the specified String. False otherwise.
- */
- private boolean contains(String[] values, String s) {
- if (values == null)
- return false;
-
- for (int i = 0; i < values.length; i++) {
- if (values[i].equals(s))
- return true;
- }
-
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java
deleted file mode 100644
index df42d7c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLServiceHelperImpl implements WSDLServiceHelper {
-
- /**
- *
- */
- public WSDLServiceHelperImpl() {
- super();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortName(java.lang.Object)
- */
- public String getPortName(Object port) {
- Port aPort = (Port)port;
- return aPort.getName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServicePorts(java.lang.Object)
- */
- public Map getServicePorts(Object aService) {
- Service service =(Service)aService;
- return service.getPorts();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceNamespaceURI(java.lang.Object)
- */
- public String getServiceNamespaceURI(Object aService) {
- Service service =(Service)aService;
- return service.getQName().getNamespaceURI();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceDefinitionLocation(org.eclipse.emf.ecore.EObject)
- */
- public Object getServiceDefinitionLocation(EObject aService) {
- Service service =(Service)aService;
- return service.getEnclosingDefinition().getLocation();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortBindingNamespaceURI(java.lang.Object)
- */
- public String getPortBindingNamespaceURI(Object aPort) {
- Port port = (Port)aPort;
- return port.getBinding().getQName().getNamespaceURI();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceLocalPart(java.lang.Object)
- */
- public String getServiceLocalPart(Object aService) {
- Service service =(Service)aService;
- return service.getQName().getLocalPart();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceQName(java.lang.Object)
- */
- public Object getServiceQName(Object aService) {
- Service service =(Service)aService;
- return service.getQName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getDefinitionServices(java.lang.Object)
- */
- public Map getDefinitionServices(Object aDefinition) {
- Definition definition =(Definition)aDefinition;
- return definition.getServices();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(java.lang.String)
- */
- public Object getWSDLDefinition(String wsdlURL) {
- try {
- WSDLResourceImpl res = (WSDLResourceImpl) WorkbenchResourceHelperBase.getResource(URI.createURI(wsdlURL), true);
- if (res == null)
- return null;
- return res.getDefinition();
- } catch (Exception wsdle) {
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(org.eclipse.emf.ecore.resource.Resource)
- */
- public Object getWSDLDefinition(Resource wsdlResource) {
- return ((WSDLResourceImpl)wsdlResource).getDefinition();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWsdlServicesFromWsilFile(org.eclipse.core.resources.IFile)
- */
- public List getWsdlServicesFromWsilFile(IFile wsil) {
- List result = new ArrayList();
- WebServiceEntity entity = parseWsilFile(wsil);
- if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSIL) {
- // get all the WSDL references from the WSIL entity
- List wsdlList = entity.getChildren();
- for (Iterator it = wsdlList.iterator(); it.hasNext();) {
- Object item = it.next();
- if (item != null && item instanceof WebServiceEntity) {
- if (((WebServiceEntity) item).getModel() != null && ((WebServiceEntity) item).getModel() instanceof Definition) {
- Definition def = (Definition) ((WebServiceEntity) item).getModel();
- if (def != null && !def.getServices().isEmpty())
- result.addAll(def.getServices().values());
- }
- }
- }
- }
- return result;
- }
- public WebServiceEntity parseWsilFile(IFile wsil) {
- WebServicesParser parser = null;
- String url = null;
- // verify proper input
- if (wsil == null || !wsil.getFileExtension().equals(WSIL_EXT))
- return null;
- // Parse wsil file to get wsdl services
- try {
- url = wsil.getLocation().toFile().toURL().toString();
- parser = new WebServicesParser(url);
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_WSDL);
- } catch (Exception e) {
- //Ignore
- }
- if (parser == null)
- return null;
- return parser.getWebServiceEntityByURI(url);
-}
-
- public boolean isService(Object aService) {
-
- return aService instanceof Service;
- }
- public boolean isWSDLResource(Object aResource) {
-
- return aResource instanceof WSDLResourceImpl;
- }
- public boolean isDefinition(Object aDefinition) {
-
- return aDefinition instanceof Definition;
- }
-
-
- public List get13ServiceRefs(EObject j2eeObject) {
- if (j2eeObject instanceof ApplicationClient)
- return WebServicesManager.getInstance().get13ServiceRefs((ApplicationClient)j2eeObject);
- else if (j2eeObject instanceof EnterpriseBean)
- return WebServicesManager.getInstance().get13ServiceRefs((EnterpriseBean)j2eeObject);
- else if (j2eeObject instanceof WebApp)
- return WebServicesManager.getInstance().get13ServiceRefs((WebApp)j2eeObject);
- else
- return Collections.EMPTY_LIST;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java
deleted file mode 100644
index efdb26b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.webservice.helper;
-
-public class WebServiceEvent {
-
- public static final int REFRESH = 1;
-
- private int eventType = 0;
-
- public WebServiceEvent(int anEventType) {
- super();
- eventType = anEventType;
- }
-
- public int getEventType() {
- return eventType;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java
deleted file mode 100644
index e1dcaee..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.webservice.helper;
-
-public interface WebServiceManagerListener {
-
- public void webServiceManagerChanged(WebServiceEvent anEvent);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java
deleted file mode 100644
index 14ca578..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java
+++ /dev/null
@@ -1,913 +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
- *******************************************************************************/
-/*
- * Created on Feb 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-
-
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSCDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor {
-
- private HashMap wsArtifactEdits;
- private HashMap wsClientArtifactEdits;
- private static WebServicesManager INSTANCE = null;
- private List listeners;
- private List removedListeners = new ArrayList();
- private boolean isNotifing = false;
-
- public static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- public static final String WSIL_EXT = "wsil"; //$NON-NLS-1$
-
- public static WebServicesManager getInstance() {
- if (INSTANCE == null)
- INSTANCE = new WebServicesManager();
- return INSTANCE;
- }
-
- /**
- * Default Constructor
- */
- public WebServicesManager() {
- super();
- init();
- }
-
- private void init() {
- collectArtifactEdits();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- }
-
- private void collectArtifactEdits() {
- IProject[] projects = ProjectUtilities.getAllProjects();
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- WSDDArtifactEdit wsddArtifactEdit = null;
- WSCDDArtifactEdit wscddArtifactEdit = null;
- IVirtualComponent component = ComponentCore.createComponent(project);
- try {
- if (!ModuleCoreNature.isFlexibleProject(project) || J2EEProjectUtilities.isEARProject(project))
- continue;
- } catch (Exception e) {
- continue;
- }
- //TODO implement a smarter solution than try catchs
- try {
- wsddArtifactEdit = WSDDArtifactEdit.getWSDDArtifactEditForRead(component);
- if (wsddArtifactEdit != null) {
- wsddArtifactEdit.addListener(this);
- getWSArtifactEdits().put(component.getProject(),wsddArtifactEdit);
- }
- } catch (Exception e) {
- if (wsddArtifactEdit != null) wsddArtifactEdit.dispose();
- }
- try {
- wscddArtifactEdit = WSCDDArtifactEdit.getWSCDDArtifactEditForRead(component);
- if (wscddArtifactEdit != null) {
- wscddArtifactEdit.addListener(this);
- getWSClientArtifactEdits().put(component.getProject(),wscddArtifactEdit);
- }
- } catch (Exception e) {
- if (wscddArtifactEdit != null) wscddArtifactEdit.dispose();
- }
- }
- }
-
- /**
- * @return Returns the editModels.
- */
- private HashMap getWSArtifactEdits() {
- if (wsArtifactEdits == null)
- wsArtifactEdits = new HashMap();
- return wsArtifactEdits;
- }
-
- /**
- * @return Returns the editModels.
- */
- private HashMap getWSClientArtifactEdits() {
- if (wsClientArtifactEdits == null)
- wsClientArtifactEdits = new HashMap();
- return wsClientArtifactEdits;
- }
-
- private List getListeners() {
- if (listeners == null)
- listeners = new ArrayList();
- return listeners;
- }
-
- /**
- * Add aListener to the list of listeners.
- */
- public void addListener(WebServiceManagerListener aListener) {
- if (aListener != null && !getListeners().contains(aListener))
- getListeners().add(aListener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- if (anEvent == null)
- return;
- if (anEvent.getEventCode()==EditModelEvent.UNLOADED_RESOURCE) {
- List resources = anEvent.getChangedResources();
- for (int i=0; i<resources.size(); i++) {
- Resource res = (Resource) resources.get(i);
- if (res instanceof WsddResource || res instanceof WebServicesResource) {
- notifyListeners(anEvent.getEventCode());
- }
- }
- }
- else if (anEvent.getEventCode() == EditModelEvent.PRE_DISPOSE) {
- ArtifactEditModel editModel = (ArtifactEditModel) anEvent.getEditModel();
- if (editModel == null || editModel.getProject() == null)
- return;
- WSDDArtifactEdit wsArtifactEdit = (WSDDArtifactEdit) getWSArtifactEdits().get(editModel.getProject());
- if (wsArtifactEdit != null) {
- try {
- getWSArtifactEdits().remove(editModel.getProject());
- wsArtifactEdit.removeListener(this);
- } finally {
- wsArtifactEdit.dispose();
- }
- }
- WSCDDArtifactEdit wsClientArtifactEdit = (WSCDDArtifactEdit) getWSClientArtifactEdits().get(editModel.getProject());
- if (wsClientArtifactEdit != null) {
- try {
- getWSClientArtifactEdits().remove(editModel.getProject());
- wsClientArtifactEdit.removeListener(this);
- } finally {
- wsClientArtifactEdit.dispose();
- }
- }
- notifyListeners(anEvent.getEventCode());
- }
- }
-
- private WSDDArtifactEdit getWSArtifactEdit(IProject handle) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) getWSArtifactEdits().get(handle);
- if (artifactEdit == null) {
- artifactEdit = WSDDArtifactEdit.getWSDDArtifactEditForRead(handle);
- if (artifactEdit != null) {
- artifactEdit.addListener(this);
- getWSArtifactEdits().put(handle,artifactEdit);
- }
- }
- return artifactEdit;
- }
-
- private WSCDDArtifactEdit getWSClientArtifactEdit(IProject handle) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) getWSClientArtifactEdits().get(handle);
- if (artifactEdit == null) {
- artifactEdit = WSCDDArtifactEdit.getWSCDDArtifactEditForRead(handle);
- if (artifactEdit != null) {
- artifactEdit.addListener(this);
- getWSClientArtifactEdits().put(handle,artifactEdit);
- }
- }
-
- return artifactEdit;
- }
-
- /**
- * Notify listeners of
- *
- * @anEvent.
- */
- protected void notifyListeners(int anEventType) {
- if (listeners == null)
- return;
- synchronized (this) {
- isNotifing = true;
- }
- try {
- List list = getListeners();
- for (int i = 0; i < list.size(); i++) {
- WebServiceEvent webServiceEvent = new WebServiceEvent(WebServiceEvent.REFRESH);
- ((WebServiceManagerListener) list.get(i)).webServiceManagerChanged(webServiceEvent);
- }
- } finally {
- synchronized (this) {
- isNotifing = false;
- if (removedListeners != null && !removedListeners.isEmpty()) {
- for (int i = 0; i < removedListeners.size(); i++)
- listeners.remove(removedListeners.get(i));
- removedListeners.clear();
- }
- }
- }
- }
-
- /**
- * Remove aListener from the list of listeners.
- */
- public synchronized boolean removeListener(WebServiceManagerListener aListener) {
- if (aListener != null) {
- if (isNotifing)
- return removedListeners.add(aListener);
- return getListeners().remove(aListener);
- }
- return false;
- }
-
- private void releaseArtifactEdits() {
- Iterator iter = getWSArtifactEdits().values().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
- getWSArtifactEdits().clear();
-
- iter = getWSClientArtifactEdits().values().iterator();
- while (iter.hasNext()) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
- getWSClientArtifactEdits().clear();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- acceptDelta(event);
- }
-
-
- protected void acceptDelta(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- // search for changes to any projects using a visitor
- if (delta != null) {
- try {
- delta.accept(this);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- /**
- * returns a list of internal web services descriptions in the workspace
- */
- public List getInternalWebServicesDescriptions() {
- List result = new ArrayList();
- List webServices = getInternalWebServices();
- for (int i = 0; i < webServices.size(); i++) {
- WebServices webService = (WebServices) webServices.get(i);
- if (webService != null)
- result.addAll(webService.getWebServiceDescriptions());
- }
- return result;
- }
-
- /**
- * @return all internal web services instances in workspace
- */
- public List getInternalWebServices() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().values().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- WebServices webServices = artifactEdit.getWebServices();
- if (webServices != null)
- result.add(webServices);
- }
- return result;
- }
-
- /**
- * returns a list of all the internal wsdl services in wsdl's pointed to by wsdd's
- */
- public List getInternalWSDLServices() {
- return getWSDLServicesFromWSDLResources(getInternalWSDLResources());
- }
-
- public List getInternalWSDLResources() {
- List result = new ArrayList();
- List wsddWebServices = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsddWebServices.size(); i++) {
- WebServiceDescription webServices = (WebServiceDescription) wsddWebServices.get(i);
- Resource wsdl = getWSDLResource(webServices);
- if (wsdl != null && !result.contains(wsdl))
- result.add(wsdl);
- }
- return result;
- }
-
- public List getExternalWSDLResources() {
- //TODO fix up for basis off .wsil
- List result = getWorkspaceWSDLResources();
- result.removeAll(getInternalWSDLResources());
- List serviceRefs = getAllWorkspaceServiceRefs();
- for (int i=0; i<serviceRefs.size(); i++) {
- ServiceRef ref = (ServiceRef) serviceRefs.get(i);
- try {
- Resource res = WorkbenchResourceHelperBase.getResource(URI.createURI(ref.getWsdlFile()), true);
- if (res !=null && result.contains(res))
- result.remove(res);
- } catch (Exception e) {
- //Ignore
- }
- }
- return result;
- }
-
- public boolean isServiceInternal(EObject service) {
- return getInternalWSDLResources().contains(getWSDLResource(service));
- }
-
- private List getWSDLServicesFromWSDLResources(List wsdlResources) {
- List result = new ArrayList();
- for (int i = 0; i < wsdlResources.size(); i++) {
- Resource wsdl = (Resource) wsdlResources.get(i);
- List services = getWSDLServices(wsdl);
- if (wsdl != null && services != null && !services.isEmpty())
- result.addAll(services);
- }
- return result;
- }
-
- public List getExternalWSDLServices() {
- List result = getWsdlServicesFromWorkspaceWSILs();
- result.removeAll(getInternalWSDLServices());
- return result;
- }
-
- public List getWsdlServicesFromWorkspaceWSILs() {
- List result = new ArrayList();
- List wsilFiles = getWorkspaceWSILFiles();
- for (int i = 0; i < wsilFiles.size(); i++) {
- IFile wsil = (IFile) wsilFiles.get(i);
- List services = getWsdlServicesFromWsilFile(wsil);
- if (!services.isEmpty())
- result.addAll(services);
- }
- return result;
- }
-
- public List getWsdlServicesFromWsilFile(IFile wsil) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- return serviceHelper.getWsdlServicesFromWsilFile(wsil);
- }
-
- /**
- * Returns all WSDL Services, both internal and external
- */
- public List getAllWSDLServices() {
- List result = new ArrayList();
- result.addAll(getInternalWSDLServices());
- result.addAll(getExternalWSDLServices());
- return result;
- }
-
- protected void dispose() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- releaseArtifactEdits();
- INSTANCE = null;
- }
-
- public Resource getWSDLResource(WebServiceDescription webService) {
- if (webService == null)
- return null;
- String wsdlFileName = webService.getWsdlFile();
- Resource res = null;
- IVirtualResource[] resources = ComponentCore.createResources(WorkbenchResourceHelper.getFile(webService));
- if (resources == null) return res;
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) getWSArtifactEdits().get(resources[0].getComponent().getProject());
- if (artifactEdit!=null)
- res = artifactEdit.getWsdlResource(wsdlFileName);
- return res;
- }
-
- public List getWSDLServices(Resource wsdl) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- List result = new ArrayList();
- Object def = serviceHelper.getWSDLDefinition(wsdl);
- if (def == null)
- return result;
- result = new ArrayList(serviceHelper.getDefinitionServices(def).values());
- return result;
- }
-
- public EObject getWSDLServiceForWebService(WebServiceDescription webService) {
- EObject service = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- Resource wsdl = getWSDLResource(webService);
- if (wsdl == null) return service;
- Object definition = serviceHelper.getWSDLDefinition(wsdl);
- if (definition == null) return service;
- Map services = serviceHelper.getDefinitionServices(definition);
- if (services.isEmpty()) return service;
- PortComponent portComp = null;
- if (webService.getPortComponents()!=null && webService.getPortComponents().size()>0) {
- portComp = (PortComponent) webService.getPortComponents().get(0);
- return getService(portComp);
- }
- return service;
- }
-
- public Resource getWSDLResource(EObject wsdlService) {
- return wsdlService.eResource();
- }
-
- public EObject getService(PortComponent port) {
- List services = getInternalWSDLServices();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- for (int i = 0; i < services.size(); i++) {
- EObject service = (EObject)services.get(i);
- if (serviceHelper.getServicePorts(service).size() == 1) {
- Object wsdlPort = serviceHelper.getServicePorts(service).values().toArray()[0];
- String qName = serviceHelper.getPortBindingNamespaceURI(wsdlPort);
- if (port.getWsdlPort().getNamespaceURI().equals(qName))
- return service;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(String qName) {
- List wsDescs = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsDescs.size(); i++) {
- WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
- List ports = wsDesc.getPortComponents();
- for (int j = 0; j < ports.size(); j++) {
- PortComponent portComp = (PortComponent) ports.get(j);
- if (portComp.getWsdlPort().getNamespaceURI().equals(qName))
- return portComp;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(String qName, IProject project) {
- List wsDescs = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsDescs.size(); i++) {
- WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
- List ports = wsDesc.getPortComponents();
- for (int j = 0; j < ports.size(); j++) {
- PortComponent portComp = (PortComponent) ports.get(j);
- if (project == ProjectUtilities.getProject(portComp))
- return portComp;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(EObject wsdlService) {
- // If there is only one port in the wsdl service, find the matching port component
- // otherwise if multiple ports return null because we need more information
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (wsdlService == null || serviceHelper.getServicePorts(wsdlService).isEmpty())
- return null;
- if (serviceHelper.getServicePorts(wsdlService).size() == 1) {
- Object port = serviceHelper.getServicePorts(wsdlService).values().toArray()[0];
- String qName = serviceHelper.getPortBindingNamespaceURI(port);
- return getPortComponent(qName, ProjectUtilities.getProject(wsdlService));
- }
- return null;
- }
-
- public ServiceImplBean getServiceImplBean(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return port.getServiceImplBean();
- }
-
- public WsddResource getWsddResource(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return (WsddResource) port.eResource();
- }
-
- public String getServiceEndpointInterface(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return port.getServiceEndpointInterface();
- }
-
- public List getAllWorkspaceServiceRefs() {
- List result = new ArrayList();
- result.addAll(getWorkspace13ServiceRefs());
- result.addAll(getWorkspace14ServiceRefs());
- return result;
- }
-
- public List getWorkspace13ServiceRefs() {
- List result = new ArrayList();
- Iterator iter = getWSClientArtifactEdits().values().iterator();
- while (iter.hasNext()) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
- result.addAll(res.getWebServicesClient().getServiceRefs());
- }
- return result;
- }
-
- public List get13ServiceRefs(IProject handle) {
-
- List result = new ArrayList();
- WSCDDArtifactEdit wsClientArtifactEdit = (WSCDDArtifactEdit) getWSClientArtifactEdits().get(handle);
- if (wsClientArtifactEdit !=null) {
- WebServicesResource res = wsClientArtifactEdit.getWscddXmiResource();
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
- result.addAll(res.getWebServicesClient().getServiceRefs());
- }
- return result;
- }
-
- public List getWorkspace14ServiceRefs() {
- List result = new ArrayList();
- Iterator iter = getWSClientArtifactEdits().values().iterator();
- while (iter.hasNext()) {
- WSCDDArtifactEdit wscArtifactEdit = (WSCDDArtifactEdit) iter.next();
- ArtifactEdit artifactEdit = ArtifactEdit.getArtifactEditForRead(wscArtifactEdit.getProject());
- try {
- EObject rootObject = artifactEdit.getContentModelRoot();
- // handle EJB project case
- if (rootObject instanceof EJBJar) {
- List cmps = ((EJBJar) rootObject).getEnterpriseBeans();
- for (int j = 0; j < cmps.size(); j++) {
- EnterpriseBean bean = (EnterpriseBean) cmps.get(j);
- if (bean.getServiceRefs() != null && !bean.getServiceRefs().isEmpty())
- result.addAll(bean.getServiceRefs());
- }
- }
- // handle Web Project
- else if (rootObject instanceof WebApp) {
- if (((WebApp) rootObject).getServiceRefs() != null && !((WebApp) rootObject).getServiceRefs().isEmpty())
- result.addAll(((WebApp) rootObject).getServiceRefs());
- }
- // handle App clients
- else if (rootObject instanceof ApplicationClient) {
- if (((ApplicationClient) rootObject).getServiceRefs() != null && !((ApplicationClient) rootObject).getServiceRefs().isEmpty())
- result.addAll(((ApplicationClient) rootObject).getServiceRefs());
- }
- } finally {
- if (artifactEdit != null)
- artifactEdit.dispose();
- }
- }
- return result;
- }
-
- public boolean isJ2EE14(ServiceRef ref) {
- return !(ref.eContainer() instanceof WebServicesClient);
- }
-
- public List getWorkspaceWSILFiles() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().values().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- List files = artifactEdit.getWSILResources();
- for (int j = 0; j < files.size(); j++) {
- IFile file = (IFile) files.get(j);
- if (file != null && WSIL_EXT.equals(file.getFileExtension()))
- result.add(file);
- }
- }
- return result;
- }
-
- public List getWorkspaceWSDLResources() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().values().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- IProject project = artifactEdit.getProject();
- if (project != null) {
- List wsdlResources = artifactEdit.getWSDLResources();
- if (wsdlResources != null && !wsdlResources.isEmpty()) {
- for (int j = 0; j < wsdlResources.size(); j++) {
- Resource wsdl = (Resource) wsdlResources.get(j);
- if (!result.contains(wsdl))
- result.add(wsdl);
- }
- }
- }
- }
- return result;
- }
-
- public List getWSDLServices() {
- List result = new ArrayList();
- List internalWsdls = getInternalWSDLServices();
- if (internalWsdls != null && !internalWsdls.isEmpty())
- result.addAll(internalWsdls);
- //TODO add externals
- return result;
- }
-
- /**
- * @param bean
- * @return
- */
- public List get13ServiceRefs(EnterpriseBean bean) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) getWSClientArtifactEdits().get(WorkbenchResourceHelper.getFile(bean).getProject());
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null && res.getWebServicesClient() != null) {
- String ejbName = bean.getName();
- List scopes = res.getWebServicesClient().getComponentScopedRefs();
- for (Iterator iter = scopes.iterator(); iter.hasNext();) {
- ComponentScopedRefs scope = (ComponentScopedRefs) iter.next();
- if (scope.getComponentName().equals(ejbName))
- return scope.getServiceRefs();
- }
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * @param client
- * @return
- */
- public List get13ServiceRefs(ApplicationClient client) {
- IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(client));
- if (handle == null)
- return Collections.EMPTY_LIST;
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) getWSClientArtifactEdits().get(handle);
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null) {
- WebServicesClient webClient = res.getWebServicesClient();
- if (webClient != null)
- return webClient.getServiceRefs();
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * @param webapp
- * @return
- */
- public List get13ServiceRefs(WebApp webapp) {
- IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(webapp));
- if (handle == null)
- return Collections.EMPTY_LIST;
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) getWSClientArtifactEdits().get(handle);
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null) {
- WebServicesClient webClient = res.getWebServicesClient();
- if (webClient != null)
- return webClient.getServiceRefs();
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource.getType() == IResource.PROJECT) {
- IProject p = (IProject) resource;
- // Handle project adds and project opens
- if ((delta.getKind()==IResourceDelta.ADDED || (((delta.getFlags() & IResourceDelta.OPEN) != 0) && p.isAccessible()))) {
- boolean state = true;
- IVirtualComponent component = ComponentCore.createComponent(p);
- if (component!=null && !J2EEProjectUtilities.isEARProject(p)) {
- WSDDArtifactEdit wsArtifactEdit = getWSArtifactEdit(p);
- if (wsArtifactEdit !=null)
- state = false;
- WSCDDArtifactEdit wscArtifactEdit = getWSClientArtifactEdit(p);
- if (wscArtifactEdit !=null) {
- state = false;
- }
- return state;
- }
- }
- // Handle project close events and removals
- else if ((delta.getKind() == IResourceDelta.CHANGED && ((delta.getFlags() & IResourceDelta.OPEN) != 0))
- || (delta.getKind() == IResourceDelta.REMOVED)){
- boolean state = true;
- List wsddArtifactEditsToRemove = getAssociatedArtifactEditKeys(p,getWSArtifactEdits());
- for (int i=0; i<wsddArtifactEditsToRemove.size(); i++) {
- IProject handle = (IProject) wsddArtifactEditsToRemove.get(i);
- if (handle != null && getWSArtifactEdits().containsKey(handle)) {
- WSDDArtifactEdit wsArtifactEdit = (WSDDArtifactEdit) getWSArtifactEdits().get(handle);
- getWSArtifactEdits().remove(handle);
- wsArtifactEdit.dispose();
- state = false;
- }
- }
- List wscddArtifactEditsToRemove = getAssociatedArtifactEditKeys(p,getWSClientArtifactEdits());
- for (int i=0; i<wscddArtifactEditsToRemove.size(); i++) {
- IProject handle = (IProject) wscddArtifactEditsToRemove.get(i);
- if (handle != null && getWSClientArtifactEdits().containsKey(handle)) {
- WSCDDArtifactEdit wscArtifactEdit = (WSCDDArtifactEdit) getWSClientArtifactEdits().get(handle);
- getWSClientArtifactEdits().remove(handle);
- wscArtifactEdit.dispose();
- state = false;
- }
- }
- return state;
- }
- }
-
- else if (resource.getType() == IResource.FILE && isInterrestedInFile((IFile) resource)) {
- // Handle WSIL and WSDL File additions
- if ((delta.getKind() == IResourceDelta.ADDED) || ((delta.getFlags() & IResourceDelta.MOVED_TO) != 0)) {
- if (resource.getFileExtension().equals(WSDL_EXT))
- addedWsdl((IFile) resource);
- else if (resource.getFileExtension().equals(WSIL_EXT))
- addedWsil((IFile)resource);
- }
- // Handle WSIL or WSDL file removals
- else if ((delta.getKind() == IResourceDelta.REMOVED) || ((delta.getFlags() & IResourceDelta.MOVED_FROM) != 0)) {
- if (resource.getFileExtension().equals(WSDL_EXT) || resource.getFileExtension().equals(WSIL_EXT))
- notifyListeners(EditModelEvent.UNLOADED_RESOURCE);
- }
- return false;
- }
- return true;
- }
-
- private List getAssociatedArtifactEditKeys(IProject project, HashMap artifactEdits) {
- List result = new ArrayList();
- Iterator iter = artifactEdits.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- IProject handle = (IProject) entry.getKey();
- if (handle.getProject().equals(project))
- result.add(handle);
- }
- return result;
- }
-
- protected void addedWsdl(IFile wsdl) {
- if (!wsdl.exists())
- return;
- IProject handle = getComponentProject(wsdl);
- if (handle != null) {
- getWSArtifactEdit(handle);
- notifyListeners(EditModelEvent.LOADED_RESOURCE);
- }
- }
-
- protected void addedWsil(IFile wsil) {
- if (!wsil.exists())
- return;
- IProject handle = getComponentProject(wsil);
- if (handle != null) {
- getWSArtifactEdit(handle);
- notifyListeners(EditModelEvent.LOADED_RESOURCE);
- }
- }
-
- private IProject getComponentProject(IFile res) {
- return res.getProject();
- }
-
- protected boolean isInterrestedInFile(IFile aFile) {
- if (aFile != null && aFile.getFileExtension() != null) {
- String extension = aFile.getFileExtension();
- return extension.equals(WSDL_EXT) || extension.equals(WSIL_EXT);
- }
- return false;
- }
-
- /**
- * @param object
- * @return
- */
- public Collection getServiceRefs(EJBJar jar) {
-
- List list = new ArrayList();
- List beans = jar.getEnterpriseBeans();
- try {
- for (int i = 0; i < beans.size(); i++) {
- EnterpriseBean bean = (EnterpriseBean) beans.get(i);
- list.addAll(getServiceRefs(bean));
- }
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-
- public Collection getServiceRefs(EnterpriseBean bean) {
- List list = new ArrayList();
- if (bean.getEjbJar().getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- list.addAll(bean.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(bean));
- return list;
- }
-
- public Collection getServiceRefs(WebApp webapp) {
-
- List list = new ArrayList();
- try {
- if (webapp.getVersionID() >= J2EEVersionConstants.WEB_2_4_ID)
- list.addAll(webapp.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(webapp));
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-
- public Collection getServiceRefs(ApplicationClient client) {
-
- List list = new ArrayList();
- try {
- if (client.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- list.addAll(client.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(client));
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
deleted file mode 100644
index 7094e0e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,231 +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
- *******************************************************************************/
-/*
- * Created on Jan 28, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicePlugin extends WTPPlugin implements ResourceLocator {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.internal.internal.webservice"; //$NON-NLS-1$
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServicePlugin singleton;
-
- /**
- * @param descriptor
- */
- public WebServicePlugin() {
- super();
- if (singleton == null)
- singleton = this;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * Returns an image descriptor for the named resource as relative to the plugin install
- * location.
- *
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor(String name) {
- try {
- URL installURL = getInstance().getBundle().getEntry("/"); //$NON-NLS-1$
- URL imageURL = new URL(installURL, name);
- return ImageDescriptor.createFromURL(imageURL);
- } catch (MalformedURLException e) {
- return null;
- }
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (ATKUIPlugin)Platform.getPlugin("com.ibm.etools.webservice.atk.ui");
- *
- * @return The ATKUIPlugin singleton.
- */
- static public WebServicePlugin getInstance() {
- return singleton;
- }
-
- /**
- * Returns the message string identified by the given key from the plugin.properties file for
- * the appropriate locale.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the string passed in
- * must be of the form "%KEY" where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @return The locale-specific message.
- */
- public static String getMessage(String key) {
- return Platform.getResourceString(getInstance().getBundle(), key);
- }
-
- /**
- * Returns the message string identified by the given key from the plugin.properties file for
- * the appropriate locale. Substitution sequences in the message string are replaced by the
- * given array of substitution objects (which are most frequently strings). See
- * java.text.MessageFormat for further details on substitution.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the string passed in
- * must be of the form "%KEY" where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @param args
- * The substitution values for the message as required by the message in
- * plugin.properties and by the rules of class java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage(String key, Object[] args) {
- return MessageFormat.format(getMessage(key), args);
- }
-
-
- /**
- * Returns the URL from which all resources are based.
- *
- * @return the URL from which all resources are based.
- */
- public URL getBaseURL() {
- String installURL = getPluginInstallLocation();
- if (installURL != null) {
- try {
- StringBuffer sb = new StringBuffer(installURL);
- sb.append("plugin.properties"); //$NON-NLS-1$
- return new URL(sb.toString());
- } catch (MalformedURLException e) {
- //Ignore
- }
- }
- return null;
- }
-
- /**
- * Returns the description that can be used to create the image resource associated with the
- * key. The description will typically be in the form of a URL to the image data. Creation of an
- * actual image depends on the GUI environment; within Eclipse,
- * org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry can be used.
- *
- * @param key
- * the key of the image resource.
- * @return the description on the image resource.
- */
- public Object getImage(String key) {
- ImageDescriptor imageDescriptor = getImageDescriptor(key);
- if (imageDescriptor != null)
- return imageDescriptor.createImage();
- return null;
- }
-
- public String getPluginStateLocation() {
- return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
- }
-
- public String getPluginInstallLocation() {
- try {
- return Platform.resolve(getInstance().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$
- } catch (Throwable t) {
- return null;
- }
- }
-
- /**
- * Returns the string resource associated with the key.
- *
- * @param key
- * the key of the string resource.
- * @return the string resource associated with the key.
- */
- public String getString(String key) {
- return getMessage(key);
- }
-
- /**
- * Returns a string resource associated with the key, and peforms substitutions.
- *
- * @param key
- * the key of the string.
- * @param substitutions
- * the message substitutions.
- * @return a string resource associated with the key.
- * @see #getString(String)
- * @see MessageFormat#format(String, Object[])
- */
- public String getString(String key, Object[] substitutions) {
- return getMessage(key, substitutions);
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- *
- * @throws CoreException
- * If this plugin fails to start.
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- WsddResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- WebServicesClientResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- *
- * @throws CoreException
- * If this plugin fails to shutdown.
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java
deleted file mode 100644
index 4d83f90..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java
+++ /dev/null
@@ -1,90 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-
-
-public class ATKUIAdapterFactory extends AdapterFactoryImpl {
- private AdapterFactory[] adapterFactories_;
-
- public ATKUIAdapterFactory() {
- adapterFactories_ = new AdapterFactory[4];
- adapterFactories_[0] = new WsddItemProviderAdapterFactory();
- adapterFactories_[1] = new ATKUIWscddAdapterFactory();
- adapterFactories_[2] = new ATKUIWscommonAdapterFactory();
- adapterFactories_[3] = new ATKUICommonAdapterFactory();
-
- }
-
- public Object adapt(Object target, Object type) {
-
- if (target instanceof Notifier) {
- for (int i = 0; i < adapterFactories_.length; i++) {
- Object object = adapterFactories_[i].adapt(target, type);
- if (object != null) {
- return object;
- }
- }
- return null;
- }
- return resolve(target, type);
- }
-
- public Adapter adapt(Notifier target, Object type) {
- Object object = adapt((Object) target, type);
- if (object instanceof Adapter) {
- return (Adapter) object;
- }
- return null;
- }
-
- /**
- * This is called by {@link #adapt(Object,Object) adapt(Object, Object)}for objects that aren't
- * notifiers.
- *
- * @param an
- * arbitrary object to adapt.
- * @param type
- * the key indicating the type of adapter required.
- * @return the object itself.
- * @see #adapt(Object,Object)
- */
- protected Object resolve(Object object, Object type) {
- if (object instanceof EList)
- return resolveEList((EList) object, type);
- else if (object instanceof AdapterViewerItem)
- return resolveAdapterViewerItem((AdapterViewerItem) object, type);
- else
- return null;
- }
-
- private Object resolveEList(EList eList, Object type) {
- if (eList.size() > 0)
- return adapt(eList.get(0), type);
- return null;
- }
-
- private Object resolveAdapterViewerItem(AdapterViewerItem adapterViewerItem, Object type) {
- return resolveEList(adapterViewerItem.getEObjectList(), type);
- }
-
- public void addListener(INotifyChangedListener listener) {
- ((WsddItemProviderAdapterFactory) adapterFactories_[0]).addListener(listener);
- ((ATKUIWscddAdapterFactory) adapterFactories_[1]).addListener(listener);
- ((ATKUIWscommonAdapterFactory) adapterFactories_[2]).addListener(listener);
- ((ATKUICommonAdapterFactory) adapterFactories_[3]).addListener(listener);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java
deleted file mode 100644
index cbad1ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java
+++ /dev/null
@@ -1,48 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.common.internal.provider.CommonItemProviderAdapterFactory;
-
-
-public class ATKUICommonAdapterFactory extends CommonItemProviderAdapterFactory {
- public ATKUICommonAdapterFactory() {
- super();
- }
-
- public Adapter createParamValueAdapter() {
- if (paramValueItemProvider == null)
- paramValueItemProvider = new ATKUIParamValueItemProvider(this);
-
- return paramValueItemProvider;
- }
-
- public Adapter createQNameAdapter() {
- if (qNameItemProvider == null) {
- qNameItemProvider = new ATKUIQNameItemProvider(this);
- }
-
- return qNameItemProvider;
- }
-
-
- /*
- * public Adapter createSOAPHeaderAdapter() { if (soapHeaderItemProvider == null)
- * soapHeaderItemProvider = new ATKUISOAPHeaderItemProvider(this); return
- * soapHeaderItemProvider; }
- *
- * public Adapter createSOAPRoleAdapter() { if (soapRoleItemProvider == null)
- * soapRoleItemProvider = new ATKUISOAPRoleItemProvider(this); return soapRoleItemProvider; }
- *
- * public Adapter createPortNameAdapter() { if (portNameItemProvider == null)
- * portNameItemProvider = new ATKUIPortNameItemProvider(this); return portNameItemProvider; }
- *
- */
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
deleted file mode 100644
index 213f348..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
+++ /dev/null
@@ -1,87 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-
-
-public class ATKUIComponentScopedRefsItemProvider extends ComponentScopedRefsItemProvider implements ITableItemLabelProvider {
- public ATKUIComponentScopedRefsItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- return toDisplayString(((ComponentScopedRefs) object).getComponentName());
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
deleted file mode 100644
index 002f32a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
+++ /dev/null
@@ -1,98 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-
-
-public class ATKUIHandlerItemProvider extends HandlerItemProvider implements ITableItemLabelProvider {
- public ATKUIHandlerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- return toDisplayString(((Handler) object).getHandlerName());
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- protected String toDisplayString(JavaClass javaClass) {
- String className = javaClass.getQualifiedNameForReflection();
- return (className != null) ? className : ""; //$NON-NLS-1$
- }
-
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java
deleted file mode 100644
index 0cb0c5d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java
+++ /dev/null
@@ -1,48 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-
-
-public class ATKUIInitParamItemProvider extends InitParamItemProvider implements ITableItemLabelProvider {
- public ATKUIInitParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- InitParam initParam = (InitParam) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(initParam.getParamName());
- case 1 :
- return toDisplayString(initParam.getParamValue());
- case 2 :
- return toDisplayString(initParam.getDescription());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(initParam.getParamName());
- sb.append("="); //$NON-NLS-1$
- sb.append(initParam.getParamValue());
- return sb.toString();
- }
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java
deleted file mode 100644
index 9ec450e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java
+++ /dev/null
@@ -1,52 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.internal.provider.ParamValueItemProvider;
-
-public class ATKUIParamValueItemProvider extends ParamValueItemProvider implements ITableItemLabelProvider {
- public ATKUIParamValueItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- ParamValue initParam = (ParamValue) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(initParam.getName());
- case 1 :
- return toDisplayString(initParam.getValue());
- case 2 :
- return toDisplayString(initParam.getDescription());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(initParam.getName());
- sb.append("="); //$NON-NLS-1$
- sb.append(initParam.getValue());
- return sb.toString();
- }
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java
deleted file mode 100644
index 7e1ef1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java
+++ /dev/null
@@ -1,53 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-
-
-public class ATKUIPortComponentRefItemProvider extends PortComponentRefItemProvider implements ITableItemLabelProvider {
- public ATKUIPortComponentRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- PortComponentRef portCompRef = (PortComponentRef) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(portCompRef.getServiceEndpointInterface());
- case 1 :
- return toDisplayString(portCompRef.getPortComponentLink());
- default :
- return toDisplayString(portCompRef.getServiceEndpointInterface());
- }
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- protected String toDisplayString(JavaClass javaClass) {
- String className = javaClass.getQualifiedNameForReflection();
- return (className != null) ? className : ""; //$NON-NLS-1$
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java
deleted file mode 100644
index 53eab32..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java
+++ /dev/null
@@ -1,35 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-
-
-public class ATKUIPortNameItemProvider extends PortNameItemProvider implements ITableItemLabelProvider {
- public ATKUIPortNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- PortName portName = (PortName) object;
- return toDisplayString(portName.getPortName());
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java
deleted file mode 100644
index d63839f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java
+++ /dev/null
@@ -1,51 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-
-
-public class ATKUIQNameItemProvider extends QNameItemProvider implements ITableItemLabelProvider {
- public ATKUIQNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- QName qname = (QName) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(qname.getNamespaceURI());
- case 1 :
- return toDisplayString(qname.getLocalPart());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(qname.getNamespaceURI());
- sb.append("#"); //$NON-NLS-1$
- sb.append(qname.getLocalPart());
- return sb.toString();
- }
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java
deleted file mode 100644
index 4909752..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java
+++ /dev/null
@@ -1,48 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-
-
-
-
-public class ATKUISOAPHeaderItemProvider extends SOAPHeaderItemProvider implements ITableItemLabelProvider {
- public ATKUISOAPHeaderItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- SOAPHeader soapHeader = (SOAPHeader) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(soapHeader.getNamespaceURI());
- case 1 :
- return toDisplayString(soapHeader.getLocalPart());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(soapHeader.getNamespaceURI());
- sb.append("#"); //$NON-NLS-1$
- sb.append(soapHeader.getLocalPart());
- return sb.toString();
- }
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java
deleted file mode 100644
index e723d25..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java
+++ /dev/null
@@ -1,35 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-
-
-public class ATKUISOAPRoleItemProvider extends SOAPRoleItemProvider implements ITableItemLabelProvider {
- public ATKUISOAPRoleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- SOAPRole soapRole = (SOAPRole) object;
- return toDisplayString(soapRole.getSoapRole());
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
deleted file mode 100644
index afa4a7c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
+++ /dev/null
@@ -1,98 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-public class ATKUIServiceRefItemProvider extends ServiceRefItemProvider implements ITableItemLabelProvider {
- public ATKUIServiceRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- public String getColumnText(Object object, int columnIndex) {
- return toDisplayString(((ServiceRef) object).getServiceRefName());
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- protected String toDisplayString(JavaClass javaClass) {
- String className = javaClass.getQualifiedNameForReflection();
- return (className != null) ? className : ""; //$NON-NLS-1$
- }
-
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
deleted file mode 100644
index bc1f1aa..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
+++ /dev/null
@@ -1,91 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-public class ATKUIWebServicesClientItemProvider extends WebServicesClientItemProvider {
- public ATKUIWebServicesClientItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- feature = Webservice_clientFactory.eINSTANCE.getWebservice_clientPackage().getWebServicesClient_ComponentScopedRefs();
- if (feature.getName().equals(adapterViewerItem.getEStructuralFeature().getName()))
- result.add(SectionComponentScopedRefHelper.getWsClient());
- return result;
- }
-
- /**
- * This returns WebServicesClient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return null;
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- return WebServicePlugin.getMessage("%LABEL_UNQUALIFIED_COMPONENT"); //$NON-NLS-1$
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java
deleted file mode 100644
index f87d9fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java
+++ /dev/null
@@ -1,59 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-
-public class ATKUIWscddAdapterFactory extends Webservice_clientItemProviderAdapterFactory {
- public ATKUIWscddAdapterFactory() {
- super();
- }
-
- public Adapter createWebServicesClientAdapter() {
- if (webServicesClientItemProvider == null)
- webServicesClientItemProvider = new ATKUIWebServicesClientItemProvider(this);
- return webServicesClientItemProvider;
- }
-
- public Adapter createComponentScopedRefsAdapter() {
- if (componentScopedRefsItemProvider == null)
- componentScopedRefsItemProvider = new ATKUIComponentScopedRefsItemProvider(this);
- return componentScopedRefsItemProvider;
- }
-
- public Adapter createPortComponentRefAdapter() {
- if (portComponentRefItemProvider == null)
- portComponentRefItemProvider = new ATKUIPortComponentRefItemProvider(this);
- return portComponentRefItemProvider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createServiceRefAdapter()
- */
- public Adapter createServiceRefAdapter() {
- if (serviceRefItemProvider == null)
- serviceRefItemProvider = new ATKUIServiceRefItemProvider(this);
- return serviceRefItemProvider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createHandlerAdapter()
- */
- public Adapter createHandlerAdapter() {
- if (handlerItemProvider == null)
- handlerItemProvider = new ATKUIHandlerItemProvider(this);
- return handlerItemProvider;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java
deleted file mode 100644
index e46f940..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java
+++ /dev/null
@@ -1,41 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-public class ATKUIWscommonAdapterFactory extends WscommonItemProviderAdapterFactory {
- public ATKUIWscommonAdapterFactory() {
- super();
- }
-
- public Adapter createInitParamAdapter() {
- if (initParamItemProvider == null)
- initParamItemProvider = new ATKUIInitParamItemProvider(this);
- return initParamItemProvider;
- }
-
- public Adapter createSOAPHeaderAdapter() {
- if (soapHeaderItemProvider == null)
- soapHeaderItemProvider = new ATKUISOAPHeaderItemProvider(this);
- return soapHeaderItemProvider;
- }
-
- public Adapter createSOAPRoleAdapter() {
- if (soapRoleItemProvider == null)
- soapRoleItemProvider = new ATKUISOAPRoleItemProvider(this);
- return soapRoleItemProvider;
- }
-
- public Adapter createPortNameAdapter() {
- if (portNameItemProvider == null)
- portNameItemProvider = new ATKUIPortNameItemProvider(this);
- return portNameItemProvider;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java
deleted file mode 100644
index f060cf4..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-
-// Non-generated provider code
-
-public abstract class AbstractATKUIItemProvider extends ItemProviderAdapter {
- public AbstractATKUIItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * Get the resource locator for this adapter's resources.
- */
- protected ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
deleted file mode 100644
index 40c0489..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
+++ /dev/null
@@ -1,163 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class BeanLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public BeanLinkItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns BeanLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/BeanLink"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { return getString("_UI_BeanLink_type"); }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- return getString("%_UI_BeanLink_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
deleted file mode 100644
index a0e2139..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
+++ /dev/null
@@ -1,165 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.ComponentScopedRefs}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ComponentScopedRefsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ComponentScopedRefsItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addComponentNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Component Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addComponentNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ComponentScopedRefs_componentName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ComponentScopedRefs_componentName_feature", "_UI_ComponentScopedRefs_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ComponentName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ServiceRefs());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns ComponentScopedRefs.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/ComponentScopedRefs.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((ComponentScopedRefs)object).getComponentName(); return label == null || label.length() == 0 ?
- * getString("_UI_ComponentScopedRefs_type") : getString("_UI_ComponentScopedRefs_type") + " " +
- * label; }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((ComponentScopedRefs) object).getComponentName();
- return label == null || label.length() == 0 ? getString("%_UI_ComponentScopedRefs_type") : label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ComponentScopedRefs.class)) {
- case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME :
- case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
deleted file mode 100644
index 6d56f5b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
+++ /dev/null
@@ -1,155 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ConstructorParameterOrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ConstructorParameterOrderItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConstructorParameterOrder_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConstructorParameterOrder_id_feature", "_UI_ConstructorParameterOrder_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames());
- }
- return childrenFeatures;
- }
-
-
- /**
- * This returns ConstructorParameterOrder.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ConstructorParameterOrder"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ConstructorParameterOrder) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ConstructorParameterOrder_type") : //$NON-NLS-1$
- getString("_UI_ConstructorParameterOrder_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ConstructorParameterOrder.class)) {
- case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID :
- case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames(), JaxrpcmapFactory.eINSTANCE.createElementName()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
deleted file mode 100644
index 8f34e6b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
+++ /dev/null
@@ -1,113 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.DescriptionItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class DescriptionTypeItemProvider extends DescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public DescriptionTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns DescriptionType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/DescriptionType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((DescriptionType) object).getLang();
- return label == null || label.length() == 0 ? getString("_UI_DescriptionType_type") : //$NON-NLS-1$
- getString("_UI_DescriptionType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
deleted file mode 100644
index d076af9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
+++ /dev/null
@@ -1,113 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.DisplayNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class DisplayNameTypeItemProvider extends DisplayNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public DisplayNameTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns DisplayNameType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/DisplayNameType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((DisplayNameType) object).getLang();
- return label == null || label.length() == 0 ? getString("_UI_DisplayNameType_type") : //$NON-NLS-1$
- getString("_UI_DisplayNameType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java
deleted file mode 100644
index f3fb6f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java
+++ /dev/null
@@ -1,158 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class EJBLinkItemProvider extends BeanLinkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public EJBLinkItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addEjbLinkPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_EJBLink_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_EJBLink_id_feature", "_UI_EJBLink_type"), WsddPackage.eINSTANCE.getEJBLink_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Ejb Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEjbLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBLink_ejbLink_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBLink_ejbLink_feature", "_UI_EJBLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getEJBLink_EjbLink(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns EJBLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/sessionBean_obj.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((EJBLink)object).getId(); return label ==
- * null || label.length() == 0 ? getString("_UI_EJBLink_type") : getString("_UI_EJBLink_type") + " " +
- * label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((EJBLink) object).getEjbLink();
- return label == null || label.length() == 0 ? getString("%_UI_EJBLink_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EJBLink.class)) {
- case WsddPackage.EJB_LINK__EJB_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java
deleted file mode 100644
index 5b29e1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java
+++ /dev/null
@@ -1,148 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ElementNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ElementNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addTextPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ElementName_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ElementName_id_feature", "_UI_ElementName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getElementName_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Text feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTextPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ElementName_text_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ElementName_text_feature", "_UI_ElementName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getElementName_Text(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns ElementName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ElementName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ElementName) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ElementName_type") : //$NON-NLS-1$
- getString("_UI_ElementName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ElementName.class)) {
- case JaxrpcmapPackage.ELEMENT_NAME__ID :
- case JaxrpcmapPackage.ELEMENT_NAME__TEXT : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
deleted file mode 100644
index 9fbb3a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
+++ /dev/null
@@ -1,200 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class ExceptionMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ExceptionMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addExceptionTypePropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_id_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getExceptionMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Exception Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addExceptionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_exceptionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_exceptionType_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ExceptionType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_wsdlMessagePartName_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessage());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ConstructorParameterOrder());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ExceptionMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ExceptionMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ExceptionMapping) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_ExceptionMapping_type") : //$NON-NLS-1$
- getString("_UI_ExceptionMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ExceptionMapping.class)) {
- case JaxrpcmapPackage.EXCEPTION_MAPPING__ID :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ConstructorParameterOrder(), JaxrpcmapFactory.eINSTANCE.createConstructorParameterOrder()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
deleted file mode 100644
index 775ed8b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
+++ /dev/null
@@ -1,222 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.Handler}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class HandlerItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public HandlerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addHandlerNamePropertyDescriptor(object);
- addSoapRolesPropertyDescriptor(object);
- addPortNamesPropertyDescriptor(object);
- addHandlerClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Handler Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addHandlerNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_handlerName_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_handlerName_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_HandlerName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Soap Roles feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addSoapRolesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_soapRoles_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_soapRoles_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_SoapRoles(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Port Names feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addPortNamesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_portNames_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_portNames_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_PortNames(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Handler Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addHandlerClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_handlerClass_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_handlerClass_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass(), false));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_InitParams());
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders());
-// childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_HandlerName());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/handler.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((Handler)object).getHandlerName();
- * return label == null || label.length() == 0 ? getString("_UI_Handler_type") :
- * getString("_UI_Handler_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((Handler) object).getHandlerName();
- return label == null || label.length() == 0 ? getString("%_UI_Handler_type") : getString("%_UI_Handler_type") + ": " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Handler.class)) {
- case Webservice_clientPackage.HANDLER__HANDLER_NAME :
- case Webservice_clientPackage.HANDLER__SOAP_ROLES :
- case Webservice_clientPackage.HANDLER__PORT_NAMES :
- case Webservice_clientPackage.HANDLER__INIT_PARAMS :
- case Webservice_clientPackage.HANDLER__SOAP_HEADERS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_InitParams(), CommonFactory.eINSTANCE.createParamValue()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), CommonFactory.eINSTANCE.createQName()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), WsddFactory.eINSTANCE.createWSDLPort()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
deleted file mode 100644
index c80243f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
+++ /dev/null
@@ -1,220 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class InitParamItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public InitParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //pgm addIdPropertyDescriptor(object);
- addParamNamePropertyDescriptor(object);
- addParamValuePropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_InitParam_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_InitParam_id_feature", "_UI_InitParam_type"),
- * WscommonPackage.eINSTANCE.getInitParam_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addParamNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_paramName_feature"), //$NON-NLS-1$
- getString("%_UI_InitParam_paramName_feature_desc"), //$NON-NLS-1$
- WscommonPackage.eINSTANCE.getInitParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addParamValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_paramValue_feature"), //$NON-NLS-1$
- getString("%_UI_InitParam_paramValue_feature_desc"), //$NON-NLS-1$
- WscommonPackage.eINSTANCE.getInitParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_description_feature"), //$NON-NLS-1$
- getString("%_UI_InitParam_description_feature_desc"), //$NON-NLS-1$
- WscommonPackage.eINSTANCE.getInitParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WscommonPackage.eINSTANCE.getInitParam_DescriptionTypes());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns InitParam.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/initializ_parameter.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((InitParam)object).getParamName();
- * return label == null || label.length() == 0 ? getString("_UI_InitParam_type") :
- * getString("_UI_InitParam_type") + " " + label; } /*
- *
- * /** This returns the label text for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc --> @non-generated
- */
- public String getText(Object object) {
- InitParam initParam = (InitParam) object;
- String name = initParam.getParamName();
- String value = initParam.getParamValue();
- if (name == null || name.length() == 0 || value == null || value.length() == 0)
- return getString("%_UI_InitParam_type"); //$NON-NLS-1$
- StringBuffer label = new StringBuffer();
- label.append(name);
- label.append("="); //$NON-NLS-1$
- label.append(value);
- return label.toString();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(InitParam.class)) {
- //pgm case WscommonPackage.INIT_PARAM__ID:
- case WscommonPackage.INIT_PARAM__PARAM_NAME :
- case WscommonPackage.INIT_PARAM__PARAM_VALUE :
- case WscommonPackage.INIT_PARAM__DESCRIPTION :
- case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WscommonPackage.eINSTANCE.getInitParam_DescriptionTypes(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- /*
- * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
- */
- public Collection getChildren(Object object) {
- Collection children = super.getChildren(object);
- InitParam param = (InitParam) object;
- if (param.getParamName() != null)
- children.add(param.getParamName());
- if (param.getParamValue() != null)
- children.add(param.getParamValue());
- if (param.getDescription() != null)
- children.add(param.getDescription());
- return children;
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
deleted file mode 100644
index fb12cac..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,109 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class InterfaceMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public InterfaceMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns InterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/InterfaceMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- return getString("_UI_InterfaceMapping_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
deleted file mode 100644
index d74ac56..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
+++ /dev/null
@@ -1,184 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class JavaWSDLMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JavaWSDLMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaWSDLMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaWSDLMapping_id_feature", "_UI_JavaWSDLMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_PackageMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_JavaXMLTypeMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_ExceptionMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns JavaWSDLMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/JavaWSDLMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((JavaWSDLMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_JavaWSDLMapping_type") : //$NON-NLS-1$
- getString("_UI_JavaWSDLMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JavaWSDLMapping.class)) {
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_PackageMappings(), JaxrpcmapFactory.eINSTANCE.createPackageMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_JavaXMLTypeMappings(), JaxrpcmapFactory.eINSTANCE.createJavaXMLTypeMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_ExceptionMappings(), JaxrpcmapFactory.eINSTANCE.createExceptionMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createInterfaceMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createServiceInterfaceMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createServiceEndpointInterfaceMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
deleted file mode 100644
index aebe191..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
+++ /dev/null
@@ -1,214 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JavaXMLTypeMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JavaXMLTypeMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addClassTypePropertyDescriptor(object);
- addQnameScopePropertyDescriptor(object);
- addAnonymousTypeQnamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_id_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Class Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addClassTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_classType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_classType_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_ClassType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Qname Scope feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addQnameScopePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_qnameScope_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_qnameScope_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_QnameScope(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Anonymous Type Qname feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAnonymousTypeQnamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_anonymousTypeQname_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_anonymousTypeQname_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_AnonymousTypeQname(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_RootTypeQname());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_VariableMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns JavaXMLTypeMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/JavaXMLTypeMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((JavaXMLTypeMapping) object).getAnonymousTypeQname();
- return label == null || label.length() == 0 ? getString("_UI_JavaXMLTypeMapping_type") : //$NON-NLS-1$
- getString("_UI_JavaXMLTypeMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JavaXMLTypeMapping.class)) {
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_RootTypeQname(), JaxrpcmapFactory.eINSTANCE.createRootTypeQname()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_VariableMappings(), JaxrpcmapFactory.eINSTANCE.createVariableMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
deleted file mode 100644
index cc3d6ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,678 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.util.JaxrpcmapAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class JaxrpcmapItemProviderAdapterFactory extends JaxrpcmapAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public JaxrpcmapItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JavaWSDLMappingItemProvider javaWSDLMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createJavaWSDLMappingAdapter() {
- if (javaWSDLMappingItemProvider == null) {
- javaWSDLMappingItemProvider = new JavaWSDLMappingItemProvider(this);
- }
-
- return javaWSDLMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected PackageMappingItemProvider packageMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createPackageMappingAdapter() {
- if (packageMappingItemProvider == null) {
- packageMappingItemProvider = new PackageMappingItemProvider(this);
- }
-
- return packageMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JavaXMLTypeMappingItemProvider javaXMLTypeMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createJavaXMLTypeMappingAdapter() {
- if (javaXMLTypeMappingItemProvider == null) {
- javaXMLTypeMappingItemProvider = new JavaXMLTypeMappingItemProvider(this);
- }
-
- return javaXMLTypeMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ExceptionMappingItemProvider exceptionMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createExceptionMappingAdapter() {
- if (exceptionMappingItemProvider == null) {
- exceptionMappingItemProvider = new ExceptionMappingItemProvider(this);
- }
-
- return exceptionMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceInterfaceMappingItemProvider serviceInterfaceMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createServiceInterfaceMappingAdapter() {
- if (serviceInterfaceMappingItemProvider == null) {
- serviceInterfaceMappingItemProvider = new ServiceInterfaceMappingItemProvider(this);
- }
-
- return serviceInterfaceMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceEndpointInterfaceMappingItemProvider serviceEndpointInterfaceMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createServiceEndpointInterfaceMappingAdapter() {
- if (serviceEndpointInterfaceMappingItemProvider == null) {
- serviceEndpointInterfaceMappingItemProvider = new ServiceEndpointInterfaceMappingItemProvider(this);
- }
-
- return serviceEndpointInterfaceMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected RootTypeQnameItemProvider rootTypeQnameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createRootTypeQnameAdapter() {
- if (rootTypeQnameItemProvider == null) {
- rootTypeQnameItemProvider = new RootTypeQnameItemProvider(this);
- }
-
- return rootTypeQnameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected VariableMappingItemProvider variableMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createVariableMappingAdapter() {
- if (variableMappingItemProvider == null) {
- variableMappingItemProvider = new VariableMappingItemProvider(this);
- }
-
- return variableMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLMessageItemProvider wsdlMessageItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLMessageAdapter() {
- if (wsdlMessageItemProvider == null) {
- wsdlMessageItemProvider = new WSDLMessageItemProvider(this);
- }
-
- return wsdlMessageItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ConstructorParameterOrderItemProvider constructorParameterOrderItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createConstructorParameterOrderAdapter() {
- if (constructorParameterOrderItemProvider == null) {
- constructorParameterOrderItemProvider = new ConstructorParameterOrderItemProvider(this);
- }
-
- return constructorParameterOrderItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected ElementNameItemProvider elementNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createElementNameAdapter() {
- if (elementNameItemProvider == null) {
- elementNameItemProvider = new ElementNameItemProvider(this);
- }
-
- return elementNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLServiceNameItemProvider wsdlServiceNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLServiceNameAdapter() {
- if (wsdlServiceNameItemProvider == null) {
- wsdlServiceNameItemProvider = new WSDLServiceNameItemProvider(this);
- }
-
- return wsdlServiceNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected PortMappingItemProvider portMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createPortMappingAdapter() {
- if (portMappingItemProvider == null) {
- portMappingItemProvider = new PortMappingItemProvider(this);
- }
-
- return portMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLPortTypeItemProvider wsdlPortTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLPortTypeAdapter() {
- if (wsdlPortTypeItemProvider == null) {
- wsdlPortTypeItemProvider = new WSDLPortTypeItemProvider(this);
- }
-
- return wsdlPortTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLBindingItemProvider wsdlBindingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLBindingAdapter() {
- if (wsdlBindingItemProvider == null) {
- wsdlBindingItemProvider = new WSDLBindingItemProvider(this);
- }
-
- return wsdlBindingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceEndpointMethodMappingItemProvider serviceEndpointMethodMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createServiceEndpointMethodMappingAdapter() {
- if (serviceEndpointMethodMappingItemProvider == null) {
- serviceEndpointMethodMappingItemProvider = new ServiceEndpointMethodMappingItemProvider(this);
- }
-
- return serviceEndpointMethodMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLOperationItemProvider wsdlOperationItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLOperationAdapter() {
- if (wsdlOperationItemProvider == null) {
- wsdlOperationItemProvider = new WSDLOperationItemProvider(this);
- }
-
- return wsdlOperationItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MethodParamPartsMappingItemProvider methodParamPartsMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createMethodParamPartsMappingAdapter() {
- if (methodParamPartsMappingItemProvider == null) {
- methodParamPartsMappingItemProvider = new MethodParamPartsMappingItemProvider(this);
- }
-
- return methodParamPartsMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLReturnValueMappingItemProvider wsdlReturnValueMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLReturnValueMappingAdapter() {
- if (wsdlReturnValueMappingItemProvider == null) {
- wsdlReturnValueMappingItemProvider = new WSDLReturnValueMappingItemProvider(this);
- }
-
- return wsdlReturnValueMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLMessageMappingItemProvider wsdlMessageMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLMessageMappingAdapter() {
- if (wsdlMessageMappingItemProvider == null) {
- wsdlMessageMappingItemProvider = new WSDLMessageMappingItemProvider(this);
- }
-
- return wsdlMessageMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLMessagePartNameItemProvider wsdlMessagePartNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLMessagePartNameAdapter() {
- if (wsdlMessagePartNameItemProvider == null) {
- wsdlMessagePartNameItemProvider = new WSDLMessagePartNameItemProvider(this);
- }
-
- return wsdlMessagePartNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected InterfaceMappingItemProvider interfaceMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createInterfaceMappingAdapter() {
- if (interfaceMappingItemProvider == null) {
- interfaceMappingItemProvider = new InterfaceMappingItemProvider(this);
- }
-
- return interfaceMappingItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
deleted file mode 100644
index 987258b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
+++ /dev/null
@@ -1,183 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MethodParamPartsMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MethodParamPartsMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addParamPositionPropertyDescriptor(object);
- addParamTypePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_id_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Position feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamPositionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_paramPosition_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_paramPosition_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_ParamPosition(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_paramType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_paramType_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_ParamType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_WsdlMessageMapping());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns MethodParamPartsMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/MethodParamPartsMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((MethodParamPartsMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_MethodParamPartsMapping_type") : //$NON-NLS-1$
- getString("_UI_MethodParamPartsMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MethodParamPartsMapping.class)) {
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID :
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION :
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE :
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_WsdlMessageMapping(), JaxrpcmapFactory.eINSTANCE.createWSDLMessageMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
deleted file mode 100644
index c634e9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
+++ /dev/null
@@ -1,163 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class PackageMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PackageMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addPackageTypePropertyDescriptor(object);
- addNamespaceURIPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_id_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPackageMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Package Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPackageTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_packageType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_packageType_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPackageMapping_PackageType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Namespace URI feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamespaceURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_namespaceURI_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_namespaceURI_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPackageMapping_NamespaceURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns PackageMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/PackageMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((PackageMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_PackageMapping_type") : //$NON-NLS-1$
- getString("_UI_PackageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PackageMapping.class)) {
- case JaxrpcmapPackage.PACKAGE_MAPPING__ID :
- case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE :
- case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
deleted file mode 100644
index 5441d28..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
+++ /dev/null
@@ -1,336 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortComponentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortComponentItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPortComponentNamePropertyDescriptor(object);
- addServiceEndpointInterfacePropertyDescriptor(object);
- addSmallIconPropertyDescriptor(object);
- addLargeIconPropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- addDisplayNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_PortComponent_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_PortComponent_id_feature", "_UI_PortComponent_type"),
- * WsddPackage.eINSTANCE.getPortComponent_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Port Component Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addPortComponentNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_portComponentName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_portComponentName_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_PortComponentName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_serviceEndpointInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_serviceEndpointInterface_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_ServiceEndpointInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSmallIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_smallIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_smallIcon_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLargeIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_largeIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_largeIcon_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_description_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDisplayNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_displayName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_displayName_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_WsdlPort());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_ServiceImplBean());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_Handlers());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_DescriptionType());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_DisplayNameType());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_IconType());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns PortComponent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /*
- * public Object getImage(Object object) { return
- * getResourceLocator().getImage("full/obj16/PortComponent"); }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((PortComponent)object).getPortComponentName(); return label == null || label.length() == 0 ?
- * getString("_UI_PortComponent_type") : getString("_UI_PortComponent_type") + " " + label; }
- */
-
- /**
- * This returns PortComponent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @non-generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/portcomponent.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((PortComponent) object).getPortComponentName();
- return label == null || label.length() == 0 ? getString("%_UI_PortComponent_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortComponent.class)) {
- case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME :
- case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE :
- case WsddPackage.PORT_COMPONENT__SMALL_ICON :
- case WsddPackage.PORT_COMPONENT__LARGE_ICON :
- case WsddPackage.PORT_COMPONENT__DESCRIPTION :
- case WsddPackage.PORT_COMPONENT__DISPLAY_NAME :
- case WsddPackage.PORT_COMPONENT__WSDL_PORT :
- case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN :
- case WsddPackage.PORT_COMPONENT__HANDLERS :
- case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE :
- case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE :
- case WsddPackage.PORT_COMPONENT__ICON_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_WsdlPort(), WsddFactory.eINSTANCE.createWSDLPort()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_ServiceImplBean(), WsddFactory.eINSTANCE.createServiceImplBean()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_Handlers(), WsddFactory.eINSTANCE.createHandler()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_DescriptionType(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_DisplayNameType(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_IconType(), CommonFactory.eINSTANCE.createIconType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java
deleted file mode 100644
index b203f2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java
+++ /dev/null
@@ -1,154 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.PortComponentRef}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortComponentRefItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortComponentRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPortComponentLinkPropertyDescriptor(object);
- addServiceEndpointInterfacePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Port Component Link feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- */
- protected void addPortComponentLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_PortComponentRef_portComponentLink_feature"), //$NON-NLS-1$
- getString("%_UI_PortComponentRef_portComponentLink_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getPortComponentRef_PortComponentLink(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- */
- protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_PortComponentRef_serviceEndpointInterface_feature"), //$NON-NLS-1$
- getString("%_UI_PortComponentRef_serviceEndpointInterface_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface(), false));
- }
-
-
- /**
- * This returns PortComponentRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/portcomponent.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((PortComponentRef)object).getPortComponentLink(); return label == null || label.length() ==
- * 0 ? getString("_UI_PortComponentRef_type") : getString("_UI_PortComponentRef_type") + " " +
- * label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((PortComponentRef) object).getPortComponentLink();
- return label == null || label.length() == 0 ? getString("%_UI_PortComponentRef_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortComponentRef.class)) {
- case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java
deleted file mode 100644
index 247d8e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java
+++ /dev/null
@@ -1,162 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addPortNamePropertyDescriptor(object);
- addJavaPortNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_id_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPortMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Port Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_portName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_portName_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPortMapping_PortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Java Port Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addJavaPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_javaPortName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_javaPortName_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPortMapping_JavaPortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns PortMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/PortMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((PortMapping) object).getPortName();
- return label == null || label.length() == 0 ? getString("_UI_PortMapping_type") : //$NON-NLS-1$
- getString("_UI_PortMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortMapping.class)) {
- case JaxrpcmapPackage.PORT_MAPPING__ID :
- case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME :
- case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java
deleted file mode 100644
index 200633c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java
+++ /dev/null
@@ -1,159 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortNameItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //pgm addIdPropertyDescriptor(object);
- addPortNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_PortName_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_PortName_id_feature", "_UI_PortName_type"), WscommonPackage.eINSTANCE.getPortName_Id(),
- * true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Port Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortName_portName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortName_portName_feature", "_UI_PortName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WscommonPackage.eINSTANCE.getPortName_PortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns PortName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/PortName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((PortName)object).getPortName();
- * return label == null || label.length() == 0 ? getString("_UI_PortName_type") :
- * getString("_UI_PortName_type") + " " + label; }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((PortName) object).getPortName();
- return label == null || label.length() == 0 ? getString("%_UI_PortName_type") : label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortName.class)) {
- //pgm case WscommonPackage.PORT_NAME__ID:
- case WscommonPackage.PORT_NAME__PORT_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- /*
- * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java
deleted file mode 100644
index 45a06cb..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java
+++ /dev/null
@@ -1,112 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class RootTypeQnameItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public RootTypeQnameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns RootTypeQname.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/RootTypeQname"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((RootTypeQname) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_RootTypeQname_type") : //$NON-NLS-1$
- getString("_UI_RootTypeQname_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java
deleted file mode 100644
index b513031..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java
+++ /dev/null
@@ -1,127 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class SOAPHeaderItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public SOAPHeaderItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns SOAPHeader.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/SOAPHeader"); //$NON-NLS-1$
- }
-
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((SOAPHeader)object).getCombinedQName(); return label == null || label.length() == 0 ?
- * getString("_UI_SOAPHeader_type") : getString("_UI_SOAPHeader_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- SOAPHeader soapHeader = (SOAPHeader) object;
- String nsURI = soapHeader.getNamespaceURI();
- String localpart = soapHeader.getLocalPart();
- if (nsURI == null || nsURI.length() == 0 || localpart == null || localpart.length() == 0)
- return getString("%_UI_SOAPHeader_type"); //$NON-NLS-1$
- StringBuffer label = new StringBuffer();
- label.append(nsURI);
- label.append("#"); //$NON-NLS-1$
- label.append(localpart);
- return label.toString();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java
deleted file mode 100644
index eb1d361..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java
+++ /dev/null
@@ -1,160 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class SOAPRoleItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public SOAPRoleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //pgm addIdPropertyDescriptor(object);
- addSoapRolePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_SOAPRole_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_SOAPRole_id_feature", "_UI_SOAPRole_type"), WscommonPackage.eINSTANCE.getSOAPRole_Id(),
- * true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Soap Role feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSoapRolePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SOAPRole_soapRole_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SOAPRole_soapRole_feature", "_UI_SOAPRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WscommonPackage.eINSTANCE.getSOAPRole_SoapRole(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns SOAPRole.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/SOAPRole"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((SOAPRole)object).getId(); return
- * label == null || label.length() == 0 ? getString("_UI_SOAPRole_type") :
- * getString("_UI_SOAPRole_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((SOAPRole) object).getSoapRole();
- return label == null || label.length() == 0 ? getString("%_UI_SOAPRole_type") : label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SOAPRole.class)) {
- //pgm case WscommonPackage.SOAP_ROLE__ID:
- case WscommonPackage.SOAP_ROLE__SOAP_ROLE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- /*
- * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java
deleted file mode 100644
index b542c95..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java
+++ /dev/null
@@ -1,41 +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
- *******************************************************************************/
-/*
- * Created on Jan 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class SectionComponentScopedRefHelper {
-
- private static WebServicesClient wsClient;
-
- public static void setWsClient(WebServicesClient client) {
- wsClient = client;
- }
-
- public static WebServicesClient getWsClient() {
- return wsClient;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
deleted file mode 100644
index cffbbaf..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,190 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceEndpointInterfaceMappingItemProvider extends InterfaceMappingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceEndpointInterfaceMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addServiceEndpointInterfacePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointInterfaceMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointInterfaceMapping_id_feature", "_UI_ServiceEndpointInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointInterfaceMapping_serviceEndpointInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointInterfaceMapping_serviceEndpointInterface_feature", "_UI_ServiceEndpointInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceEndpointInterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ServiceEndpointInterfaceMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ServiceEndpointInterfaceMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ServiceEndpointInterfaceMapping_type") : //$NON-NLS-1$
- getString("_UI_ServiceEndpointInterfaceMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceEndpointInterfaceMapping.class)) {
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType(), JaxrpcmapFactory.eINSTANCE.createWSDLPortType()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding(), JaxrpcmapFactory.eINSTANCE.createWSDLBinding()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings(), JaxrpcmapFactory.eINSTANCE.createServiceEndpointMethodMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
deleted file mode 100644
index 2d3251e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
+++ /dev/null
@@ -1,214 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceEndpointMethodMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceEndpointMethodMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addJavaMethodNamePropertyDescriptor(object);
- addWsdlOperationPropertyDescriptor(object);
- addWrappedElementPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_id_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Java Method Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addJavaMethodNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_javaMethodName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_javaMethodName_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_JavaMethodName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Operation feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlOperationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_wsdlOperation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_wsdlOperation_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlOperation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wrapped Element feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWrappedElementPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_wrappedElement_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_wrappedElement_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WrappedElement(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_MethodParamPartsMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlReturnValueMapping());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceEndpointMethodMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ServiceEndpointMethodMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ServiceEndpointMethodMapping) object).getJavaMethodName();
- return label == null || label.length() == 0 ? getString("_UI_ServiceEndpointMethodMapping_type") : //$NON-NLS-1$
- getString("_UI_ServiceEndpointMethodMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceEndpointMethodMapping.class)) {
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_MethodParamPartsMappings(), JaxrpcmapFactory.eINSTANCE.createMethodParamPartsMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlReturnValueMapping(), JaxrpcmapFactory.eINSTANCE.createWSDLReturnValueMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
deleted file mode 100644
index 1a7a6de..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
+++ /dev/null
@@ -1,253 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceImplBeanItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceImplBeanItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_ServiceImplBean_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_ServiceImplBean_id_feature", "_UI_ServiceImplBean_type"),
- * WsddPackage.eINSTANCE.getServiceImplBean_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink());
- childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_EServletLink());
- childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceImplBean.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/srvce_elem_obj.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((ServiceImplBean)object).getId();
- * return label == null || label.length() == 0 ? getString("_UI_ServiceImplBean_type") :
- * getString("_UI_ServiceImplBean_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- ServiceImplBean serviceImplBean = (ServiceImplBean) object;
- String ejbLink = serviceImplBean.getEEJBLink().getEjbLink();
- if (ejbLink != null && ejbLink.length() > 0)
- return ejbLink;
- String beanLink = serviceImplBean.getBeanLink().toString();
- if (beanLink != null && beanLink.length() > 0)
- return beanLink;
- String servletLink = serviceImplBean.getEServletLink().getServletLink();
- if (servletLink != null && servletLink.length() > 0)
- return servletLink;
- return getString("%_UI_ServiceImplBean_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceImplBean.class)) {
- case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK :
- case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK :
- case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink(), WsddFactory.eINSTANCE.createEJBLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_EServletLink(), WsddFactory.eINSTANCE.createServletLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createBeanLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createServletLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createEJBLink()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == WsddPackage.eINSTANCE.getServiceImplBean_EServletLink() || feature == WsddPackage.eINSTANCE.getServiceImplBean_BeanLink() || feature == WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
deleted file mode 100644
index 5ee3d04..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,185 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceInterfaceMappingItemProvider extends InterfaceMappingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceInterfaceMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addServiceInterfacePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceInterfaceMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceInterfaceMapping_id_feature", "_UI_ServiceInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceInterfaceMapping_serviceInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceInterfaceMapping_serviceInterface_feature", "_UI_ServiceInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_ServiceInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_PortMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceInterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ServiceInterfaceMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ServiceInterfaceMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ServiceInterfaceMapping_type") : //$NON-NLS-1$
- getString("_UI_ServiceInterfaceMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceInterfaceMapping.class)) {
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID :
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE :
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME :
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName(), JaxrpcmapFactory.eINSTANCE.createWSDLServiceName()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_PortMappings(), JaxrpcmapFactory.eINSTANCE.createPortMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
deleted file mode 100644
index 0c4add8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
+++ /dev/null
@@ -1,64 +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
- *******************************************************************************/
-/*
- * Created on Mar 26, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ServiceRefEditorItemProvider extends ServiceRefItemProvider {
- /**
- * @param adapterFactory
- */
- public ServiceRefEditorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers());
- }
- return childrenReferences;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object arg0) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
deleted file mode 100644
index 98a1570..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
+++ /dev/null
@@ -1,228 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.ServiceRef}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceRefItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addServiceInterfacePropertyDescriptor(object);
- addServiceRefNamePropertyDescriptor(object);
- addWsdlFilePropertyDescriptor(object);
- addJaxrpcMappingFilePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Service Ref Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceRefNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_serviceRefName_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_serviceRefName_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceRefName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addWsdlFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_wsdlFile_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_wsdlFile_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_WsdlFile(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Jaxrpc Mapping File feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- */
- protected void addJaxrpcMappingFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_jaxrpcMappingFile_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_jaxrpcMappingFile_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_JaxrpcMappingFile(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- */
- protected void addServiceInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_serviceInterface_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_serviceInterface_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface(), false));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- //childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_PortComponentRefs());
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers());
- //childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/serviceref.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((ServiceRef)object).getServiceRefName(); return label == null || label.length() == 0 ?
- * getString("_UI_ServiceRef_type") : getString("_UI_ServiceRef_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((ServiceRef) object).getServiceRefName();
- return "ServiceRef " + label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceRef.class)) {
- case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME :
- case Webservice_clientPackage.SERVICE_REF__WSDL_FILE :
- case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE :
- case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS :
- case Webservice_clientPackage.SERVICE_REF__HANDLERS :
- case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_PortComponentRefs(), Webservice_clientFactory.eINSTANCE.createPortComponentRef()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers(), Webservice_clientFactory.eINSTANCE.createHandler()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), CommonFactory.eINSTANCE.createQName()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), WsddFactory.eINSTANCE.createWSDLPort()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java
deleted file mode 100644
index 1096775..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java
+++ /dev/null
@@ -1,156 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServletLinkItemProvider extends BeanLinkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServletLinkItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addServletLinkPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_ServletLink_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_ServletLink_id_feature", "_UI_ServletLink_type"),
- * WsddPackage.eINSTANCE.getServletLink_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Servlet Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletLink_servletLink_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletLink_servletLink_feature", "_UI_ServletLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getServletLink_ServletLink(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns ServletLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/servlet.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((ServletLink)object).getId(); return
- * label == null || label.length() == 0 ? getString("_UI_ServletLink_type") :
- * getString("_UI_ServletLink_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((ServletLink) object).getServletLink();
- return label == null || label.length() == 0 ? getString("%_UI_ServletLink_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServletLink.class)) {
- case WsddPackage.SERVLET_LINK__SERVLET_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
deleted file mode 100644
index c4e815b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
+++ /dev/null
@@ -1,205 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class VariableMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public VariableMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addJavaVariableNamePropertyDescriptor(object);
- addXmlElementNamePropertyDescriptor(object);
- addDataMemberPropertyDescriptor(object);
- addXmlAttributeNamePropertyDescriptor(object);
- addXmlWildcardPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_id_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Java Variable Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addJavaVariableNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_javaVariableName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_javaVariableName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_JavaVariableName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Xml Element Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addXmlElementNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlElementName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlElementName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlElementName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Data Member feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDataMemberPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_dataMember_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_dataMember_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_DataMember(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Xml Attribute Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addXmlAttributeNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlAttributeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlAttributeName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlAttributeName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Xml Wildcard feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addXmlWildcardPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlWildcard_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlWildcard_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlWildcard(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
-
- /**
- * This returns VariableMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/VariableMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((VariableMapping) object).getJavaVariableName();
- return label == null || label.length() == 0 ? getString("_UI_VariableMapping_type") : //$NON-NLS-1$
- getString("_UI_VariableMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(VariableMapping.class)) {
- case JaxrpcmapPackage.VARIABLE_MAPPING__ID :
- case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME :
- case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME :
- case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER :
- case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME :
- case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java
deleted file mode 100644
index 229f199..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java
+++ /dev/null
@@ -1,112 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLBindingItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLBindingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLBinding.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLBinding"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLBinding) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLBinding_type") : //$NON-NLS-1$
- getString("_UI_WSDLBinding_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java
deleted file mode 100644
index 8e540b8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java
+++ /dev/null
@@ -1,112 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLMessageItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLMessageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLMessage.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLMessage"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLMessage) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLMessage_type") : //$NON-NLS-1$
- getString("_UI_WSDLMessage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
deleted file mode 100644
index e84f8dd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
+++ /dev/null
@@ -1,197 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLMessageMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLMessageMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- addParameterModePropertyDescriptor(object);
- addSoapHeaderPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_id_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_wsdlMessagePartName_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Parameter Mode feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParameterModePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_parameterMode_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_parameterMode_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_ParameterMode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Soap Header feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSoapHeaderPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_soapHeader_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_soapHeader_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_SoapHeader(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessage());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns WSDLMessageMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLMessageMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLMessageMapping) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLMessageMapping_type") : //$NON-NLS-1$
- getString("_UI_WSDLMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLMessageMapping.class)) {
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
deleted file mode 100644
index af6c536..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
+++ /dev/null
@@ -1,149 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLMessagePartNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLMessagePartNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessagePartName_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessagePartName_id_feature", "_UI_WSDLMessagePartName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessagePartName_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessagePartName_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessagePartName_wsdlMessagePartName_feature", "_UI_WSDLMessagePartName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessagePartName_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns WSDLMessagePartName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLMessagePartName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLMessagePartName) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLMessagePartName_type") : //$NON-NLS-1$
- getString("_UI_WSDLMessagePartName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLMessagePartName.class)) {
- case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID :
- case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java
deleted file mode 100644
index d3880fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java
+++ /dev/null
@@ -1,148 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLOperationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLOperationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addWsdlOperationPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLOperation_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLOperation_id_feature", "_UI_WSDLOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLOperation_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Operation feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlOperationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLOperation_wsdlOperation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLOperation_wsdlOperation_feature", "_UI_WSDLOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLOperation_WsdlOperation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns WSDLOperation.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLOperation"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLOperation) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_WSDLOperation_type") : //$NON-NLS-1$
- getString("_UI_WSDLOperation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLOperation.class)) {
- case JaxrpcmapPackage.WSDL_OPERATION__ID :
- case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java
deleted file mode 100644
index 10e9436..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java
+++ /dev/null
@@ -1,129 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLPortItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLPortItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLPort.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/wsdl.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((WSDLPort)object).getCombinedQName();
- * return label == null || label.length() == 0 ? getString("_UI_WSDLPort_type") :
- * getString("_UI_WSDLPort_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- WSDLPort wsdlport = (WSDLPort) object;
- String nsURI = wsdlport.getNamespaceURI();
- String localpart = wsdlport.getLocalPart();
- if (nsURI == null || nsURI.length() == 0 || localpart == null || localpart.length() == 0)
- return getString("%_UI_WSDLPort_type"); //$NON-NLS-1$
- StringBuffer label = new StringBuffer();
- label.append(nsURI);
- label.append("#"); //$NON-NLS-1$
- label.append(localpart);
- return label.toString();
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java
deleted file mode 100644
index 4e717b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java
+++ /dev/null
@@ -1,112 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLPortTypeItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLPortTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLPortType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLPortType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLPortType) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLPortType_type") : //$NON-NLS-1$
- getString("_UI_WSDLPortType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
deleted file mode 100644
index fc62613..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
+++ /dev/null
@@ -1,183 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLReturnValueMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLReturnValueMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addMethodReturnValuePropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_id_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Method Return Value feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addMethodReturnValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_methodReturnValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_methodReturnValue_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_MethodReturnValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_wsdlMessagePartName_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessage());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns WSDLReturnValueMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLReturnValueMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLReturnValueMapping) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLReturnValueMapping_type") : //$NON-NLS-1$
- getString("_UI_WSDLReturnValueMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLReturnValueMapping.class)) {
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID :
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE :
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME :
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
deleted file mode 100644
index d2f5003..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
+++ /dev/null
@@ -1,113 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WSDLServiceNameItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLServiceNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLServiceName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLServiceName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WSDLServiceName) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLServiceName_type") : //$NON-NLS-1$
- getString("_UI_WSDLServiceName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
deleted file mode 100644
index df59e82..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
+++ /dev/null
@@ -1,344 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WebServiceDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WebServiceDescriptionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addJaxrpcMappingFilePropertyDescriptor(object);
- addWebServiceDescriptionNamePropertyDescriptor(object);
- addWsdlFilePropertyDescriptor(object);
- addSmallIconPropertyDescriptor(object);
- addLargeIconPropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- addDisplayNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_WebServiceDescription_id_feature"),
- * getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_id_feature",
- * "_UI_WebServiceDescription_type"), WsddPackage.eINSTANCE.getWebServiceDescription_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Jaxrpc Mapping File feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addJaxrpcMappingFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_jaxrpcMappingFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_jaxrpcMappingFile_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_JaxrpcMappingFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Web Service Description Name feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWebServiceDescriptionNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_webServiceDescriptionName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_webServiceDescriptionName_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_WebServiceDescriptionName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_wsdlFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_wsdlFile_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_WsdlFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSmallIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_smallIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_smallIcon_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLargeIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_largeIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_largeIcon_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_description_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDisplayNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_displayName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_displayName_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_PortComponents());
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_DescriptionType());
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_DisplayNameType());
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_IconType());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns WebServiceDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /*
- * public Object getImage(Object object) { return
- * getResourceLocator().getImage("full/obj16/WebServiceDescription"); }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((WebServiceDescription)object).getWebServiceDescriptionName(); return label == null ||
- * label.length() == 0 ? getString("_UI_WebServiceDescription_type") :
- * getString("_UI_WebServiceDescription_type") + " " + label; }
- */
-
- /**
- * This returns WebServiceDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/webservicedesc.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((WebServiceDescription) object).getWebServiceDescriptionName();
- return label == null || label.length() == 0 ? getString("%_UI_WebServiceDescription_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebServiceDescription.class)) {
- case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_PortComponents(), WsddFactory.eINSTANCE.createPortComponent()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_DescriptionType(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_DisplayNameType(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_IconType(), CommonFactory.eINSTANCE.createIconType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
deleted file mode 100644
index 123b610..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
+++ /dev/null
@@ -1,154 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.WebServicesClient}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WebServicesClientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WebServicesClientItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ComponentScopedRefs());
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ServiceRefs());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns WebServicesClient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WebServicesClient"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
-
- public String getText(Object object) {
- //return getString("_UI_WebServicesClient_type");
- return getString("%_UI_WebServicesClient_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebServicesClient.class)) {
- case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS :
- case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ComponentScopedRefs(), Webservice_clientFactory.eINSTANCE.createComponentScopedRefs()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
deleted file mode 100644
index 4e3323e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
+++ /dev/null
@@ -1,163 +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.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WebServicesItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WebServicesItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_WebServices_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_WebServices_id_feature", "_UI_WebServices_type"),
- * WsddPackage.eINSTANCE.getWebServices_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServices_WebServiceDescriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns WebServices.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WebServices"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((WebServices)object).getDisplayName();
- * return label == null || label.length() == 0 ? getString("_UI_WebServices_type") :
- * getString("_UI_WebServices_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((WebServices) object).getDisplayName();
- return label == null || label.length() == 0 ? getString("%_UI_WebServices_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebServices.class)) {
- case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServices_WebServiceDescriptions(), WsddFactory.eINSTANCE.createWebServiceDescription()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java
deleted file mode 100644
index 232671d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java
+++ /dev/null
@@ -1,48 +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
- *******************************************************************************/
-/*
- * Created on Mar 26, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class Webservice_clientEditorItemProviderFactory extends Webservice_clientItemProviderAdapterFactory {
- /**
- *
- */
- public Webservice_clientEditorItemProviderFactory() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createServiceRefAdapter()
- */
- public Adapter createServiceRefAdapter() {
- if (serviceRefItemProvider == null) {
- serviceRefItemProvider = new ServiceRefEditorItemProvider(this);
- }
-
- return serviceRefItemProvider;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
deleted file mode 100644
index ffed806..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,279 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.util.Webservice_clientAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class Webservice_clientItemProviderAdapterFactory extends Webservice_clientAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Webservice_clientItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.wsclient.ServiceRef}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceRefItemProvider serviceRefItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.ServiceRef}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createServiceRefAdapter() {
- if (serviceRefItemProvider == null) {
- serviceRefItemProvider = new ServiceRefItemProvider(this);
- }
-
- return serviceRefItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.wsclient.PortComponentRef}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected PortComponentRefItemProvider portComponentRefItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.PortComponentRef}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createPortComponentRefAdapter() {
- if (portComponentRefItemProvider == null) {
- portComponentRefItemProvider = new PortComponentRefItemProvider(this);
- }
-
- return portComponentRefItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.wsclient.Handler}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected HandlerItemProvider handlerItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.Handler}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createHandlerAdapter() {
- if (handlerItemProvider == null) {
- handlerItemProvider = new HandlerItemProvider(this);
- }
-
- return handlerItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.wsclient.WebServicesClient}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected WebServicesClientItemProvider webServicesClientItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.WebServicesClient}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWebServicesClientAdapter() {
- if (webServicesClientItemProvider == null) {
- webServicesClientItemProvider = new WebServicesClientItemProvider(this);
- }
-
- return webServicesClientItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.wsclient.ComponentScopedRefs}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected ComponentScopedRefsItemProvider componentScopedRefsItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.ComponentScopedRefs}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createComponentScopedRefsAdapter() {
- if (componentScopedRefsItemProvider == null) {
- componentScopedRefsItemProvider = new ComponentScopedRefsItemProvider(this);
- }
-
- return componentScopedRefsItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java
deleted file mode 100644
index d9aab30..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java
+++ /dev/null
@@ -1,91 +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.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Webservice-j2ee edit plugin. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public final class Webservicej2eeEditPlugin extends EMFPlugin {
- /**
- * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public static final Webservicej2eeEditPlugin INSTANCE = new Webservicej2eeEditPlugin();
-
- /**
- * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Webservicej2eeEditPlugin() {
- super(new ResourceLocator[]{});
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the singleton instance.
- * @generated
- */
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin </b>. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public static class Implementation extends EclipsePlugin {
- /**
- * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param descriptor
- * the description of the plugin.
- * @generated
- */
- public Implementation(IPluginDescriptor descriptor) {
- super(descriptor);
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
deleted file mode 100644
index aa84566..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,307 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.util.WscommonAdapterFactory;
-
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WscommonItemProviderAdapterFactory extends WscommonAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public WscommonItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected InitParamItemProvider initParamItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createInitParamAdapter() {
- if (initParamItemProvider == null) {
- initParamItemProvider = new InitParamItemProvider(this);
- }
-
- return initParamItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected SOAPHeaderItemProvider soapHeaderItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createSOAPHeaderAdapter() {
- if (soapHeaderItemProvider == null) {
- soapHeaderItemProvider = new SOAPHeaderItemProvider(this);
- }
-
- return soapHeaderItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected SOAPRoleItemProvider soapRoleItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createSOAPRoleAdapter() {
- if (soapRoleItemProvider == null) {
- soapRoleItemProvider = new SOAPRoleItemProvider(this);
- }
-
- return soapRoleItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected PortNameItemProvider portNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createPortNameAdapter() {
- if (portNameItemProvider == null) {
- portNameItemProvider = new PortNameItemProvider(this);
- }
-
- return portNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected DescriptionTypeItemProvider descriptionTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createDescriptionTypeAdapter() {
- if (descriptionTypeItemProvider == null) {
- descriptionTypeItemProvider = new DescriptionTypeItemProvider(this);
- }
-
- return descriptionTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected DisplayNameTypeItemProvider displayNameTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createDisplayNameTypeAdapter() {
- if (displayNameTypeItemProvider == null) {
- displayNameTypeItemProvider = new DisplayNameTypeItemProvider(this);
- }
-
- return displayNameTypeItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
deleted file mode 100644
index 1a91929..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,374 +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.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.wsdd.provider.HandlerItemProvider;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.util.WsddAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WsddItemProviderAdapterFactory extends WsddAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public WsddItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected WebServicesItemProvider webServicesItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWebServicesAdapter() {
- if (webServicesItemProvider == null) {
- webServicesItemProvider = new WebServicesItemProvider(this);
- }
-
- return webServicesItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WebServiceDescriptionItemProvider webServiceDescriptionItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWebServiceDescriptionAdapter() {
- if (webServiceDescriptionItemProvider == null) {
- webServiceDescriptionItemProvider = new WebServiceDescriptionItemProvider(this);
- }
-
- return webServiceDescriptionItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected PortComponentItemProvider portComponentItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createPortComponentAdapter() {
- if (portComponentItemProvider == null) {
- portComponentItemProvider = new PortComponentItemProvider(this);
- }
-
- return portComponentItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected WSDLPortItemProvider wsdlPortItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createWSDLPortAdapter() {
- if (wsdlPortItemProvider == null) {
- wsdlPortItemProvider = new WSDLPortItemProvider(this);
- }
-
- return wsdlPortItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceImplBeanItemProvider serviceImplBeanItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createServiceImplBeanAdapter() {
- if (serviceImplBeanItemProvider == null) {
- serviceImplBeanItemProvider = new ServiceImplBeanItemProvider(this);
- }
-
- return serviceImplBeanItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected ServletLinkItemProvider servletLinkItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createServletLinkAdapter() {
- if (servletLinkItemProvider == null) {
- servletLinkItemProvider = new ServletLinkItemProvider(this);
- }
-
- return servletLinkItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected EJBLinkItemProvider ejbLinkItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createEJBLinkAdapter() {
- if (ejbLinkItemProvider == null) {
- ejbLinkItemProvider = new EJBLinkItemProvider(this);
- }
-
- return ejbLinkItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected HandlerItemProvider handlerItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createHandlerAdapter() {
- if (handlerItemProvider == null) {
- handlerItemProvider = new HandlerItemProvider(this);
- }
-
- return handlerItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected BeanLinkItemProvider beanLinkItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createBeanLinkAdapter() {
- if (beanLinkItemProvider == null) {
- beanLinkItemProvider = new BeanLinkItemProvider(this);
- }
-
- return beanLinkItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
deleted file mode 100644
index d0fb4e1..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
+++ /dev/null
@@ -1,271 +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.jst.j2ee.internal.wsdd.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/*
- * This class should be merged with HandlerItemProvider in org.eclipse.jst.j2ee.internal.internal.internal.webservice.provider
- * package and all references to this class need to be replaced with HandlerItemProvider in
- * org.eclipse.jst.j2ee.internal.internal.internal.webservice.provider package.
- */
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class HandlerItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public HandlerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addHandlerNamePropertyDescriptor(object);
- addHandlerClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_Handler_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_Handler_id_feature", "_UI_Handler_type"), WsddPackage.eINSTANCE.getHandler_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Handler Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHandlerNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Handler_handlerName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Handler_handlerName_feature", "_UI_Handler_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getHandler_HandlerName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Handler Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHandlerClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Handler_handlerClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Handler_handlerClass_feature", "_UI_Handler_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getHandler_HandlerClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getHandler_InitParams());
- childrenReferences.add(WsddPackage.eINSTANCE.getHandler_SoapHeaders());
- childrenReferences.add(WsddPackage.eINSTANCE.getHandler_SoapRoles());
- childrenReferences.add(WsddPackage.eINSTANCE.getHandler_HandlerClass());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /*
- * public Object getImage(Object object) { return
- * getResourceLocator().getImage("full/obj16/Handler"); }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((Handler)object).getDisplayName();
- * return label == null || label.length() == 0 ? getString("_UI_Handler_type") :
- * getString("_UI_Handler_type") + " " + label; }
- */
- /**
- * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @non-generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/handler.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- public String getText(Object object) {
- String label = ((Handler) object).getHandlerName();
- return label == null || label.length() == 0 ? getString("%_UI_Handler_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Handler.class)) {
- case WsddPackage.HANDLER__HANDLER_NAME :
- case WsddPackage.HANDLER__HANDLER_CLASS :
- case WsddPackage.HANDLER__INIT_PARAMS :
- case WsddPackage.HANDLER__SOAP_HEADERS :
- case WsddPackage.HANDLER__SOAP_ROLES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_InitParams(), WscommonFactory.eINSTANCE.createInitParam()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_SoapHeaders(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_SoapRoles(), WscommonFactory.eINSTANCE.createSOAPRole()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/.classpath b/plugins/org.eclipse.jst.j2ee/.classpath
deleted file mode 100644
index 4bb03a4..0000000
--- a/plugins/org.eclipse.jst.j2ee/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="j2eeplugin/"/>
- <classpathentry kind="src" path="common/"/>
- <classpathentry kind="src" path="commonedit/"/>
- <classpathentry kind="src" path="earproject/"/>
- <classpathentry kind="src" path="j2eecreation/"/>
- <classpathentry kind="src" path="archiveops/"/>
- <classpathentry kind="src" path="applicationedit/"/>
- <classpathentry kind="src" path="appclientcreation/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="refactor"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee/.cvsignore b/plugins/org.eclipse.jst.j2ee/.cvsignore
deleted file mode 100644
index c57b639..0000000
--- a/plugins/org.eclipse.jst.j2ee/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.j2ee/.project b/plugins/org.eclipse.jst.j2ee/.project
deleted file mode 100644
index 8f2cf14..0000000
--- a/plugins/org.eclipse.jst.j2ee/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
deleted file mode 100644
index f5217c4..0000000
--- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,72 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: J2EE Component
-Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.j2ee.application.internal.operations,
- org.eclipse.jst.j2ee.applicationclient.componentcore.util,
- org.eclipse.jst.j2ee.applicationclient.internal.creation,
- org.eclipse.jst.j2ee.applicationclient.internal.modulecore.util,
- org.eclipse.jst.j2ee.common.internal.provider,
- org.eclipse.jst.j2ee.componentcore,
- org.eclipse.jst.j2ee.componentcore.util,
- org.eclipse.jst.j2ee.datamodel.properties,
- org.eclipse.jst.j2ee.internal,
- org.eclipse.jst.j2ee.internal.application.common,
- org.eclipse.jst.j2ee.internal.application.provider,
- org.eclipse.jst.j2ee.internal.archive.operations,
- org.eclipse.jst.j2ee.internal.common,
- org.eclipse.jst.j2ee.internal.common.operations,
- org.eclipse.jst.j2ee.internal.delete,
- org.eclipse.jst.j2ee.internal.deploy,
- org.eclipse.jst.j2ee.internal.deployables,
- org.eclipse.jst.j2ee.internal.earcreation,
- org.eclipse.jst.j2ee.internal.earcreation.modulemap,
- org.eclipse.jst.j2ee.internal.modulecore.util,
- org.eclipse.jst.j2ee.internal.moduleextension,
- org.eclipse.jst.j2ee.internal.plugin,
- org.eclipse.jst.j2ee.internal.project,
- org.eclipse.jst.j2ee.internal.provider,
- org.eclipse.jst.j2ee.internal.rename,
- org.eclipse.jst.j2ee.internal.servertarget,
- org.eclipse.jst.j2ee.internal.validation,
- org.eclipse.jst.j2ee.internal.webservices,
- org.eclipse.jst.j2ee.project.datamodel.properties,
- org.eclipse.jst.j2ee.project.facet,
- org.eclipse.jst.j2ee.refactor,
- org.eclipse.jst.j2ee.refactor.listeners,
- org.eclipse.jst.j2ee.refactor.operations
-Require-Bundle: org.eclipse.emf.edit,
- org.eclipse.jem.workbench,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jdt.core,
- org.eclipse.wst.validation,
- org.eclipse.emf.ecore.edit,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem.workbench,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jem,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.codegen,
- org.eclipse.jdt.launching,
- org.eclipse.wst.sse.core,
- org.eclipse.jface,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.modulecore;visibility:=reexport,
- org.eclipse.jem.util,
- org.eclipse.jst.common.annotations.controller,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.web
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee/about.html b/plugins/org.eclipse.jst.j2ee/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
deleted file mode 100644
index 79a84bf..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.applicationclient.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClientArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-
- /**
- * <p>
- * Identifier used to link AppClientArtifactEdit to a AppClientEditAdapterFactory {@see
- * AppClientEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = AppClientArtifactEdit.class;
-
- /**
- *
- */
- public AppClientArtifactEdit() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public AppClientArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- public AppClientArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.APPLICATION_CLIENT);
- }
-
- public AppClientArtifactEdit(ArtifactEditModel anArtifactEditModel) {
- super(anArtifactEditModel);
- }
-
- /**
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aNature
- * @param aModule
- * @param toAccessAsReadOnly
- */
- protected AppClientArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
- * </p>
- *
- * @return Resource
- *
- */
-
- public Resource getDeploymentDescriptorResource() {
- return getArtifactEditModel().getResource(J2EEConstants.APP_CLIENT_DD_URI_OBJ);
- }
-
- /**
- * <p>
- * Obtains the ApplicationClient (@see ApplicationClient) root object from the ApplicationClientResource. If the root object does
- * not exist, then one is created (@link addAppClientJarIfNecessary(getAppClientXmiResource())).
- * The root object contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- *
- */
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addAppClientIfNecessary(getApplicationClientXmiResource());
- return (EObject) contents.get(0);
- }
-
- /**
- *
- * @return ApplicationClientResource from (@link getDeploymentDescriptorResource())
- *
- */
-
- public ApplicationClientResource getApplicationClientXmiResource() {
- return (ApplicationClientResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (ApplicationClient) and populates with data. Adds the root
- * object to the deployment descriptor resource.
- * </p>
- *
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource}
- *
- * Note: This method is typically used for JUNIT - move?
- * </p>
- */
- protected void addAppClientIfNecessary(XMLResource aResource) {
-
- if (aResource != null && aResource.getContents().isEmpty()) {
- ApplicationClient appClient = ClientFactory.eINSTANCE.createApplicationClient();
- aResource.getContents().add(appClient);
- URI moduleURI = getArtifactEditModel().getModuleURI();
- try {
- appClient.setDisplayName(StructureEdit.getDeployedName(moduleURI));
- } catch (UnresolveableURIException e) {
- //Ignore
- }
- aResource.setID(appClient, J2EEConstants.APP_CLIENT_ID);
- //TODO add more mandatory elements
- }
- }
-
- /**
- * <p>
- * Method used for adding a j2ee project to an ear project; subclasses must override to create a
- * new instance of the correct kind of Module
- * </p>
- */
- public Module createNewModule() {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createJavaClientModule();
- }
-
- /**
- *
- * @return ApplicationClient from (@link getDeploymentDescriptorRoot())
- *
- */
- public ApplicationClient getApplicationClient() {
- return (ApplicationClient) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from ApplicationClientResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- *
- */
-
- public int getJ2EEVersion() {
- return getApplicationClientXmiResource().getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static AppClientArtifactEdit getAppClientArtifactEditForRead(IProject aProject) {
- AppClientArtifactEdit artifactEdit = null;
- try {
- if (isValidApplicationClientModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new AppClientArtifactEdit(aProject, true, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static AppClientArtifactEdit getAppClientArtifactEditForWrite(IProject aProject) {
- AppClientArtifactEdit artifactEdit = null;
- try {
- if (isValidApplicationClientModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new AppClientArtifactEdit(aProject, false, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of AppClientArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an AppClientArtifactEdit facade for a specific {@see WorkbenchComponent} that will not
- * be used for editing. Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of AppClientArtifactEdit that may only be used to read the underlying content
- * model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static AppClientArtifactEdit getAppClientArtifactEditForRead(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getAppClientArtifactEditForRead(aModule.getProject());
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of AppClientArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an AppClientArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of AppClientArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static AppClientArtifactEdit getAppClientArtifactEditForWrite(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getAppClientArtifactEditForWrite(aModule.getProject());
- }
-
- /**
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param module
- * A {@see WorkbenchComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidApplicationClientModule(IVirtualComponent aModule) throws UnresolveableURIException {
- if (!isValidEditableModule(aModule))
- return false;
- return J2EEProjectUtilities.isApplicationClientProject(aModule.getProject());
- }
-
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(java.lang.Integer)
- */
- public EObject createModelRoot(int version) {
- ApplicationClientResource res = (ApplicationClientResource)getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addAppClientIfNecessary(res);
- return ((ApplicationClientResource)getDeploymentDescriptorResource()).getRootObject();
- }
-
- public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
-
- return getAppClientArtifactEditForRead(aComponent);
- }
-
- public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
-
- return getAppClientArtifactEditForWrite(aComponent);
- }
-
- public Archive asArchive(boolean includeSource) throws OpenFailureException{
- AppClientComponentLoadStrategyImpl loader = new AppClientComponentLoadStrategyImpl(getComponent());
- loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- return CommonarchiveFactory.eINSTANCE.openApplicationClientFile(loader, uri);
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- AppClientArtifactEdit appClientEdit = new AppClientArtifactEdit(project,false,true);
- try {
- appClientEdit.createModelRoot(version);
- appClientEdit.save(null);
- } finally {
- appClientEdit.dispose();
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/package.xml
deleted file mode 100644
index 49e3e8c..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>EJB Artifact Edit api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the AppClientArtifactEdit api. This api is used to work with the emf model
- of a flexible application client module. It contains api to read and serialize out the emf model for application client modules.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModelProvider.java
deleted file mode 100644
index 90f4d78..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,147 +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.jst.j2ee.applicationclient.internal.creation;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * @deprecated
- * @see AppClientFacetProjectCreationDataModelProvider
- */
-
-public class AppClientComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IAppClientComponentCreationDataModelProperties {
-
- public AppClientComponentCreationDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(CREATE_DEFAULT_MAIN_CLASS);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CREATE_DEFAULT_MAIN_CLASS)) {
- return getProperty(CREATE_DEFAULT_FILES);
- } else if (propertyName.equals(ADD_TO_EAR)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(MANIFEST_FOLDER)) {
- return IPath.SEPARATOR + CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
- }
- if (propertyName.equals(DD_FOLDER)) {
- return IPath.SEPARATOR + CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
- }
- if (propertyName.equals(JAVASOURCE_FOLDER)) {
- return CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER;
- } else if (propertyName.equals(MODULE_URI)) {
- return getProject().getName()+IJ2EEModuleConstants.JAR_EXT;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected Integer getDefaultComponentVersion() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- return new Integer(highestJ2EEPref);
- }
-
- protected DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- DataModelPropertyDescriptor[] descriptors = null;
- switch (highestJ2EEPref) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- descriptors = new DataModelPropertyDescriptor[1];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_3_ID :
- descriptors = new DataModelPropertyDescriptor[2];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_4_ID :
- default :
- descriptors = new DataModelPropertyDescriptor[3];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
- descriptors[2] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_4_ID), J2EEVersionConstants.VERSION_1_4_TEXT);
- break;
- }
- return descriptors;
- }
-
- protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
- return moduleVersion;
- }
-
- protected EClass getComponentType() {
- return CommonarchivePackage.eINSTANCE.getApplicationClientFile();
- }
-
- protected String getComponentExtension() {
- return ".jar"; //$NON-NLS-1$
- }
-
- public IDataModelOperation getDefaultOperation() {
- //return new AppClientComponentCreationOperation(model);
- return new AppClientComponentCreationFacetOperation(model);
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- return super.getValidPropertyDescriptors(propertyName);
- }
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean doSet = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(JAVASOURCE_FOLDER)){
- //unless MANIFEST folder is opened up, it is set as same as Java source folder
- setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF); //$NON-NLS-1$
- }
- return doSet;
- }
-
- protected String getJ2EEProjectType() {
- return J2EEProjectUtilities.APPLICATION_CLIENT;
- }
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
- if (propertyName.equals(COMPONENT_VERSION)) {
- Integer propertyValue = (Integer) getProperty(propertyName);
- String description = null;
- switch (propertyValue.intValue()) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- description = J2EEVersionConstants.VERSION_1_2_TEXT;
- break;
- case J2EEVersionConstants.J2EE_1_3_ID :
- description = J2EEVersionConstants.VERSION_1_3_TEXT;
- break;
- case J2EEVersionConstants.J2EE_1_4_ID :
- default :
- description = J2EEVersionConstants.VERSION_1_4_TEXT;
- break;
- }
- return new DataModelPropertyDescriptor(propertyValue, description);
- }
- return super.getPropertyDescriptor(propertyName);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationFacetOperation.java
deleted file mode 100644
index f93664c..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.applicationclient.internal.creation;
-
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEComponentCreationFacetOperation;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-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.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation implements IFacetProjectCreationDataModelProperties {
-
- public AppClientComponentCreationFacetOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(FACET_DM_MAP);
- IDataModel javaDM = setupJavaInstallAction();
- map.add(javaDM);
- IDataModel newModel = setupAppClientFacetInstallAction();
- map.add(newModel);
- setRuntime(newModel, dm); // Setting runtime property
- setAddToEARFromWizard(newModel);
- IStatus stat = dm.getDefaultOperation().execute(monitor, info);
- if (stat.isOK()) {
- String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- if (earProject != null && earProject.exists())
- stat = addtoEar(projectName, earProjectName);
- }
-
- return stat;
- }
-
- protected IDataModel setupAppClientFacetInstallAction() {
- String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
- IDataModel facetInstallDataModel = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
- facetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- facetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
- facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
- facetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
- if (model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR))
- facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME, model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
- facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, model.getProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
- facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(IJ2EEComponentCreationDataModelProperties.RUNTIME_TARGET_ID));
- return facetInstallDataModel;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentImportDataModelProvider.java
deleted file mode 100644
index 9cf32af..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,46 +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.jst.j2ee.applicationclient.internal.creation;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientComponentImportOperation;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public final class AppClientComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider implements IAppClientComponentImportDataModelProperties {
-
- public AppClientComponentImportDataModelProvider() {
- super();
- }
-
- protected int getType() {
- return XMLResource.APP_CLIENT_TYPE;
- }
-
- protected Archive openArchive(String uri) throws OpenFailureException {
- return CommonarchiveFactory.eINSTANCE.openApplicationClientFile(getArchiveOptions(), uri);
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new AppClientComponentImportOperation(model);
- }
-
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new AppClientComponentCreationDataModelProvider());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientCreationResourceHandler.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientCreationResourceHandler.java
deleted file mode 100644
index c35ede9..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientCreationResourceHandler.java
+++ /dev/null
@@ -1,31 +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.jst.j2ee.applicationclient.internal.creation;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AppClientCreationResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "appclientcreation";//$NON-NLS-1$
-
- private AppClientCreationResourceHandler() {
- // Do not instantiate
- }
-
- public static String Error_occured_getting_appl_ERROR_;
- public static String Creating_Application_Clien_UI_;
- public static String Error_occured_loading_appl_UI_;
- public static String Not_an_Application_Client_project_ERROR_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AppClientCreationResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index ec05b17..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.applicationclient.internal.creation;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-public class AppClientFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
- public AppClientFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- map.add(javaFacet);
- IDataModel appClientFacet = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
- map.add(appClientFacet);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME,appClientFacet.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));
-
- appClientFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
- setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
- }else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_EAR, event.getProperty());
- }
- }
- });
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/IConfigurationConstants.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/IConfigurationConstants.java
deleted file mode 100644
index 8848cf0..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/IConfigurationConstants.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.applicationclient.internal.creation;
-
-
-/**
- * Insert the type's description here. Creation date: (4/4/2001 10:05:24 AM)
- *
- * @author: Administrator
- */
-public interface IConfigurationConstants {
- final String PLUG_IN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java
deleted file mode 100644
index f3f5095..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.applicationclient.internal.modulecore.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-public class AppClientEditAdapterFactory implements IAdapterFactory {
-
- public AppClientEditAdapterFactory() {
- super();
- }
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == AppClientArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
- ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
- if (J2EEProjectUtilities.isApplicationClientProject(editModel.getProject()))
- return new AppClientArtifactEdit((ArtifactEditModel) adaptableObject);
- }
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ArtifactEdit.class, AppClientArtifactEdit.class};
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
deleted file mode 100644
index f780830..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class AppClientFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IAppClientFacetInstallDataModelProperties {
-
- public AppClientFacetInstallDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CREATE_DEFAULT_MAIN_CLASS);
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(FACET_ID))
- return J2EEProjectUtilities.APPLICATION_CLIENT;
- else if (propertyName.equals(CREATE_DEFAULT_MAIN_CLASS))
- return Boolean.TRUE;
- else if (propertyName.equals(CONFIG_FOLDER))
- return CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER;
- else if (propertyName.equals(MODULE_URI)) {
- String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- return projectName + IJ2EEModuleConstants.JAR_EXT;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(version.getVersionString());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
deleted file mode 100644
index 5583b6e..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-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.emf.ecore.EPackage;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationOp;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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.IFacetedProject;
-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.IRuntime;
-
-public class AppClientFacetInstallDelegate extends J2EEFacetInstallDelegate 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;
- final IJavaProject jproj = JavaCore.create(project);
-
- // Add WTP natures.
- WtpUtils.addNatures(project);
-
- // Setup the flexible project structure.
- final IVirtualComponent c = createFlexibleProject(monitor, project, model, jproj);
-
- // Setup the classpath.
- ClasspathHelper.removeClasspathEntries(project, fv);
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- // Associate with an EAR, if necessary.
- final String earProjectName = (String) model.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)) {
- if (earProjectName != null && !earProjectName.equals("")) { //$NON-NLS-1$
- String ver = fv.getVersionString();
-// String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString
-// (J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(ver));
-
- String j2eeVersionText = ver;
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- installEARFacet(j2eeVersionText, earProjectName, (IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME), monitor);
-
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider() {
- public Object getDefaultProperty(String propertyName) {
- if (IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
- Map map = new HashMap();
- map.put(c, moduleURI);
- return map;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new AddComponentToEnterpriseApplicationOp(model) {
- protected Module createNewModule(IVirtualComponent wc) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createJavaClientModule();
- }
- };
- }
- });
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(c);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- // Add main class if necessary
- if (model.getBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS))
- addMainClass(monitor, model, project);
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- if (monitor != null)
- monitor.worked(1);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (monitor != null)
- monitor.done();
- }
- }
-
- protected IVirtualComponent createFlexibleProject(IProgressMonitor monitor, IProject project, IDataModel model, IJavaProject jproj) throws Exception {
- // Create the directory structure.
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
- c.create(0, null);
- c.setMetaProperty("java-output-path", "/build/classes/"); //$NON-NLS-1$ //$NON-NLS-2$
- final IVirtualFolder root = c.getRootFolder();
-
- IFolder sourceFolder = null;
- String configFolder = null;
- configFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- root.createLink(new Path("/" + configFolder), 0, null); //$NON-NLS-1$
- String configFolderName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- IPath configFolderpath = pjpath.append(configFolderName);
- sourceFolder = ws.getRoot().getFolder(configFolderpath);
-
- if (!sourceFolder.getFile(J2EEConstants.APP_CLIENT_DD_URI).exists()) {
- String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
- AppClientArtifactEdit.createDeploymentDescriptor(project, nVer);
- }
-
- // add source folder maps
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- root.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
- }
- }
- return c;
- }
-
- private void addMainClass(IProgressMonitor monitor, IDataModel model, IProject project) {
- try {
- IDataModel mainClassDataModel = DataModelFactory.createDataModel(NewJavaClassDataModelProvider.class);
- mainClassDataModel.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, project.getName());
- mainClassDataModel.setProperty(INewJavaClassDataModelProperties.CLASS_NAME, "Main"); //$NON-NLS-1$
- mainClassDataModel.setBooleanProperty(INewJavaClassDataModelProperties.MAIN_METHOD, true);
- String projRelativeSourcePath = IPath.SEPARATOR + project.getName() + IPath.SEPARATOR + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- mainClassDataModel.setProperty(INewJavaClassDataModelProperties.SOURCE_FOLDER, projRelativeSourcePath);
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- mainClassDataModel.setProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT, javaProject.getPackageFragmentRoots()[0]);
- mainClassDataModel.getDefaultOperation().execute(monitor, null);
- createManifestEntryForMainClass(monitor, model, project);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- protected void createManifestEntryForMainClass(IProgressMonitor monitor, IDataModel model, IProject project) throws CoreException, InvocationTargetException, InterruptedException {
- IVirtualComponent appClientComponent = ComponentCore.createComponent(project);
- IVirtualFile vf = appClientComponent.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
- if (manifestmf == null || !manifestmf.exists()) {
- try {
- createManifest(project, appClientComponent.getRootFolder().getUnderlyingFolder(), monitor);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- String manifestFolder = IPath.SEPARATOR + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER) + IPath.SEPARATOR + J2EEConstants.META_INF;
- IContainer container = project.getFolder(manifestFolder);
- manifestmf = container.getFile(new Path(J2EEConstants.MANIFEST_SHORT_NAME));
- }
- if (model.getBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS)) {
- IDataModel dm = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
- dm.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, project.getName());
- dm.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- dm.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- dm.setProperty(UpdateManifestDataModelProperties.MAIN_CLASS, "Main"); //$NON-NLS-1$
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (Exception e) {
- // Ignore
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/IAppClientFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/IAppClientFacetInstallDataModelProperties.java
deleted file mode 100644
index 3436004..0000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/IAppClientFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-public interface IAppClientFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
- /**
- * Optional, type Boolean. the default value is <code>Boolean.TRUE</code>.If this is true and CREATE_DEFAULT_FILES is true, then a default main
- * class will be generated during component creation.
- */
- public static final String CREATE_DEFAULT_MAIN_CLASS = "IAppClientComponentCreationDataModelProperties.CREATE_DEFAULT_MAIN_CLASS"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java
deleted file mode 100644
index a1f94fd..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java
+++ /dev/null
@@ -1,131 +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.jst.j2ee.internal.application.common;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandActionDelegate;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-
-/**
- * This is used to generate a command that will add a new child of appropriate type to an object.
- * The implementation specifies an owner, a feature, and a helper to which the implementation is
- * delegated,
- */
-public class CreateChildCommand extends CommandWrapper implements CommandActionDelegate {
-
- /**
- * This is the helper interface to which child creation is delegated.
- */
- public static interface Helper {
- /**
- * This implements the default command behavior
- */
- public Object createChild(Object object);
-
- /**
- * This returns the default label
- */
- public String getCreateChildText(Object object);
-
- /**
- * This returns the default help text
- */
- public String getCreateChildToolTipText(Object object);
-
- /**
- * This returns the default image
- */
- public Object getCreateChildImage(Object object);
- }
-
- /**
- * This is the editing doman in which this command operates.
- */
- protected EditingDomain domain;
- /**
- * This is the owner to which children will be added.
- */
- protected EObject owner;
- /**
- * This is the feature of the owner to which children will be added.
- */
- protected EReference feature;
- /**
- * This is the helper object to which child creation is delegated.
- */
- protected CreateChildCommand.Helper helper;
-
- /**
- * This creates an instances that will add something to the owner's feature based on the
- * delegate helper.
- */
- public CreateChildCommand(EditingDomain domain, EObject owner, EReference feature, CreateChildCommand.Helper helper) {
- super();
-
- this.domain = domain;
- this.owner = owner;
- this.feature = feature;
- this.helper = helper;
- }
-
- /**
- * This returns a command that creates a new child of some appropriate type.
- */
- public static Command create(EditingDomain domain, Object object) {
- return domain.createCommand(CreateChildCommand.class, new CommandParameter(object));
- }
-
- /**
- * This creates the add command that will implement this action and specifies the collection by
- * delegating to {@link CreateChildCommand.Helper#getCreateChildImage}.
- */
- protected Command createCommand() {
- if (feature == null) {
- return AddCommand.create(domain, owner, null, helper.createChild(owner));
- }
- return new AddCommand(domain, owner, feature, helper.createChild(owner));
- }
-
- /**
- * This delegates to {@link CreateChildCommand.Helper#getCreateChildToolTipText}.
- */
- public String getDescription() {
- return helper.getCreateChildToolTipText(owner);
- }
-
- /**
- * This delegates to {@link CreateChildCommand.Helper#getCreateChildImage}.
- */
- public Object getImage() {
- return helper.getCreateChildImage(owner);
- }
-
- /**
- * This delegates to {@link CreateChildCommand.Helper#getCreateChildText}.
- */
- public String getText() {
- return helper.getCreateChildText(owner);
- }
-
- /**
- * This delegates to {@link CreateChildCommand.Helper#getCreateChildToolTipText}.
- */
- public String getToolTipText() {
- return helper.getCreateChildToolTipText(owner);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java
deleted file mode 100644
index edff7f5..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java
+++ /dev/null
@@ -1,214 +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.jst.j2ee.internal.application.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}object.
- */
-public class ApplicationItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ApplicationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- Module child = org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getApplicationFactory().createModule();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- ApplicationPackage pkg = ApplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getApplication_SecurityRoles());
- result.add(pkg.getApplication_Modules());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateModule"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return ApplicationProvidersResourceHandler.getString("Create_Module_UI_"); //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return ApplicationProvidersResourceHandler.getString("Create_a_child_of_type_Module_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This returns Application.gif.
- */
- public Object getImage(Object object) {
- String key = null;
- if (((Application) object).eResource() == null)
- return J2EEPlugin.getPlugin().getImage("earFile_obj"); //$NON-NLS-1$
- switch (((Application) object).getVersionID()) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- key = "12_ear_obj"; //$NON-NLS-1$
- break;
- case J2EEVersionConstants.J2EE_1_3_ID :
- key = "13_ear_obj"; //$NON-NLS-1$
- break;
- case J2EEVersionConstants.J2EE_1_4_ID :
- default :
- key = "14_ear_obj"; //$NON-NLS-1$
- break;
- }
- return J2EEPlugin.getPlugin().getImage(key);
- }
-
- /**
- * This returns the parent of the Application.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Application_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Application_version_feature", "_UI_Application_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ApplicationPackage.eINSTANCE.getApplication_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- public String getText(Object object) {
-
- String displayName = ((Application) object).getDisplayName();
- return displayName == null ? ApplicationProvidersResourceHandler.getString("<<No_display_name>>_ERROR_") : displayName; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Application.class)) {
- case ApplicationPackage.APPLICATION__VERSION :
- case ApplicationPackage.APPLICATION__SECURITY_ROLES :
- case ApplicationPackage.APPLICATION__MODULES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_SecurityRoles(), CommonFactory.eINSTANCE.createSecurityRole()));
-
- newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createModule()));
-
- newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createWebModule()));
-
- newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createJavaClientModule()));
-
- newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createEjbModule()));
-
- newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createConnectorModule()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java
deleted file mode 100644
index 173415d..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java
+++ /dev/null
@@ -1,65 +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.jst.j2ee.internal.application.provider;
-
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-
-
-/**
- * This extended item provider supports the following commands:
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. The
- * commands are implemented uniformly on all our item adapters using this common base class.
- */
-public class ApplicationItemProviderAdapter extends ItemProviderAdapter {
- /**
- * This creates and instance from an adapter factory and a domain notifier.
- */
- protected ApplicationItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This implements the default behavior for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- return null;
- }
-
- /**
- * This returns the default image for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("CreateChild"); //$NON-NLS-1$
- }
-
- /**
- * This returns the default label for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
- }
-
- /**
- * This returns the default help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return ApplicationProvidersResourceHandler.getString("Create_a_new_child_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java
deleted file mode 100644
index c1000c6..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,267 +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.jst.j2ee.internal.application.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.internal.util.ApplicationAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}.
- */
- protected Collection supportedTypes = new ArrayList();
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}instances.
- */
- protected ApplicationItemProvider applicationItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}instances.
- */
- protected ModuleItemProvider moduleItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}instances.
- */
- protected WebModuleItemProvider webModuleItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
- */
- protected JavaClientModuleItemProvider javaClientModuleItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
- */
- protected ConnectorModuleItemProvider connectorModuleItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}instances.
- */
- protected EjbModuleItemProvider ejbModuleItemProvider;
- protected Disposable disposable = new Disposable();
-
- /**
- * This constructs an instance.
- */
- public ApplicationItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- public Adapter adapt(Notifier target, Object adapterKey) {
- return super.adapt(target, this);
- }
-
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- public Adapter adaptNew(Notifier target, Object adapterType) {
- Adapter adapter = super.adaptNew(target, adapterType);
- disposable.add(adapter);
- return adapter;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}.
- */
- public Adapter createApplicationAdapter() {
- if (applicationItemProvider == null) {
- applicationItemProvider = new ApplicationItemProvider(this);
- }
-
- return applicationItemProvider;
- }
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}.
- */
- public Adapter createEjbModuleAdapter() {
- if (ejbModuleItemProvider == null) {
- ejbModuleItemProvider = new EjbModuleItemProvider(this);
- }
-
- return ejbModuleItemProvider;
- }
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}.
- */
- public Adapter createJavaClientModuleAdapter() {
- if (javaClientModuleItemProvider == null) {
- javaClientModuleItemProvider = new JavaClientModuleItemProvider(this);
- }
-
- return javaClientModuleItemProvider;
- }
-
- /**
- * This creates an adapter for a connector.
- *
- * @return Adapter
- */
- public Adapter createConnectorModuleAdapter() {
- if (connectorModuleItemProvider == null) {
- connectorModuleItemProvider = new ConnectorModuleItemProvider(this);
- }// if
-
- return connectorModuleItemProvider;
- }// createConnectorModuleAdapter
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}.
- */
- public Adapter createModuleAdapter() {
- if (moduleItemProvider == null) {
- moduleItemProvider = new ModuleItemProvider(this);
- }
-
- return moduleItemProvider;
- }
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}.
- */
- public Adapter createWebModuleAdapter() {
- if (webModuleItemProvider == null) {
- webModuleItemProvider = new WebModuleItemProvider(this);
- }
-
- return webModuleItemProvider;
- }
-
- public void dispose() {
- disposable.dispose();
- }
-
- /**
- * This calls {@link INotifyChangedListener#fireNotifyChanged fireNotifyChanged}for each viewer
- * in {@link #notifyChangedListeners}.
- */
- /*
- * public void fireNotifyChanged(Object object, int eventType, Object feature, Object oldValue,
- * Object newValue, int index) { for (Iterator i = notifyChangedListeners.iterator();
- * i.hasNext(); ) { INotifyChangedListener notifyChangedListener =
- * (INotifyChangedListener)i.next(); notifyChangedListener.notifyChanged(new
- * ENotificationImpl((InternalEObject)object, eventType,(EStructuralFeature) feature, oldValue,
- * newValue, index)); }
- *
- * if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(object, eventType,
- * feature, oldValue, newValue, index); } }
- */
- /**
- * This returns the root adapter factory that contains this factory.
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java
deleted file mode 100644
index 2bee279..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java
+++ /dev/null
@@ -1,93 +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.jst.j2ee.internal.application.provider;
-
-
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-public class ApplicationProvidersResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
- public static ResourceLocator RESOURCE_LOCATOR = new ResourceLocator() {
- public URL getBaseURL() {
- return null;
- }
-
- public Object getImage(String arg0) {
- return J2EEPlugin.getPlugin().getImage(arg0);
- }
-
- public String getString(String arg0) {
- return ApplicationProvidersResourceHandler.getString(arg0);
- }
-
- public String getString(String arg0, Object[] arg1) {
- return ApplicationProvidersResourceHandler.getString(arg0, arg1);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
- };
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("applicationproviders");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ConnectorModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ConnectorModuleItemProvider.java
deleted file mode 100644
index ee08848..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ConnectorModuleItemProvider.java
+++ /dev/null
@@ -1,126 +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.jst.j2ee.internal.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adapter for a Connector modules in ears.
- */
-public class ConnectorModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - Current adapter
- */
- public ConnectorModuleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// ConnectorModuleItemProvider
-
- /**
- * This returns resource image
- *
- * @param Object
- * object - resource
- * @return Object
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/connector_module"); //$NON-NLS-1$
- }// getImage
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ConnectorModule) object).getUri();
- return label == null || label.length() == 0 ? getString("_UI_ConnectorModule_type") : //$NON-NLS-1$
- getString("_UI_ConnectorModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
- }
-
- /**
- * This returns the parent of the ConnectorModule.
- *
- * @param Object
- * object - resource
- * @return Object
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - resource
- * @return List
- */
- public List getPropertyDescriptors(Object object) {
-
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- }// if
-
- return itemPropertyDescriptors;
- }// getPropertyDescriptors
-
-}// ConnectorModuleItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java
deleted file mode 100644
index 1dcc01e..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java
+++ /dev/null
@@ -1,108 +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.jst.j2ee.internal.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}object.
- */
-public class EjbModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EjbModuleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns EjbModule.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("module_ejb_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((EjbModule) object).getUri();
- return label == null || label.length() == 0 ? getString("_UI_EjbModule_type") : //$NON-NLS-1$
- getString("_UI_EjbModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
- }
-
- /**
- * This returns the parent of the EjbModule.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- }
- return itemPropertyDescriptors;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java
deleted file mode 100644
index 9e14a7f..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java
+++ /dev/null
@@ -1,108 +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.jst.j2ee.internal.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}object.
- */
-public class JavaClientModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public JavaClientModuleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns JavaClientModule.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("module_clientapp_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((JavaClientModule) object).getUri();
- return label == null || label.length() == 0 ? getString("_UI_JavaClientModule_type") : //$NON-NLS-1$
- getString("_UI_JavaClientModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
- }
-
- /**
- * This returns the parent of the JavaClientModule.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- }
- return itemPropertyDescriptors;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java
deleted file mode 100644
index c00f591..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java
+++ /dev/null
@@ -1,179 +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.jst.j2ee.internal.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}object.
- */
-public class ModuleItemProvider extends ApplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ModuleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns Module.gif.
- */
- public Object getImage(Object object) {
- return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("Module"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the Module.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- ApplicationPackage pkg = ApplicationPackage.eINSTANCE;
-
- // This is for the uri feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Uri_UI_"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_uri_property_UI_"), //$NON-NLS-1$
- pkg.getModule_Uri()));
-
- // This is for the altDD feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("AltDD_UI_"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_altDD_property_UI_"), //$NON-NLS-1$
- pkg.getModule_AltDD(), false));
-
- // This is for the application feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Application_UI_"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_application_property_UI_"), //$NON-NLS-1$
- pkg.getModule_Application(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Uri feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUriPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Module_uri_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Module_uri_feature", "_UI_Module_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ApplicationPackage.eINSTANCE.getModule_Uri(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Alt DD feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addAltDDPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Module_altDD_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Module_altDD_feature", "_UI_Module_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ApplicationPackage.eINSTANCE.getModule_AltDD(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- public String getText(Object object) {
- return getURIIfPossible((Module) object);
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Module.class)) {
- case ApplicationPackage.MODULE__URI :
- case ApplicationPackage.MODULE__ALT_DD : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- public static String getURIIfPossible(Module m) {
- return m.getUri() == null ? ApplicationProvidersResourceHandler.getString("<<URI_not_set>>_ERROR_") : m.getUri(); //$NON-NLS-1$
- }
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
- */
- /*
- * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
- * Object newValue, int index) { ApplicationPackage pkg = ApplicationPackage.eINSTANCE;; if
- * (feature == pkg.getModule_Uri() || feature == pkg.getModule_AltDD() || feature ==
- * pkg.getModule_Application()) { fireNotifyChanged(notifier, eventType, feature, oldValue,
- * newValue, index); // ModuleExtension does not update automatically. // The following code is
- * to explicitly notify ApplicationExtension if (feature == pkg.getModule_Uri() || feature ==
- * pkg.getModule_AltDD() ) { ApplicationExtension applicationExtension =
- * ApplicationExtensionsHelper.getApplicationExtension(((Module)notifier).getApplication()); if
- * (applicationExtension == null) return; EObject newFeature =
- * ApplicationextPackage.eINSTANCE.getApplicationExtension_ModuleExtensions(); Object
- * moduleExtension = applicationExtension.getModuleExtension((Module)notifier); Notification
- * notification = new NotificationImpl(applicationExtension, Notification.SET, newFeature,
- * moduleExtension, moduleExtension); applicationExtension.eNotify(notification); } // code ends
- * return; } super.notifyChanged(notifier, eventType, feature, oldValue, newValue, index); }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java
deleted file mode 100644
index 7b185b6..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java
+++ /dev/null
@@ -1,138 +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.jst.j2ee.internal.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}object.
- */
-public class WebModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WebModuleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns WebModule.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("module_web_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((WebModule) object).getUri();
- return label == null || label.length() == 0 ? getString("_UI_WebModule_type") : //$NON-NLS-1$
- getString("_UI_WebModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebModule.class)) {
- case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- public ResourceLocator getResourceLocator() {
- return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
- }
-
- /**
- * This returns the parent of the WebModule.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- ApplicationPackage pkg = ApplicationPackage.eINSTANCE;
-
- // This is for the contextRoot feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("ContextRoot_UI_"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_contextRoot_property_UI_"), //$NON-NLS-1$
- pkg.getWebModule_ContextRoot(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Context Root feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addContextRootPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebModule_contextRoot_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebModule_contextRoot_feature", "_UI_WebModule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ApplicationPackage.eINSTANCE.getWebModule_ContextRoot(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
deleted file mode 100644
index 6534a77..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
+++ /dev/null
@@ -1,275 +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.jst.j2ee.internal.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}object.
- */
-public class ApplicationClientItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ApplicationClientItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: create some child object.
- return null;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- ClientPackage pkg = ClientPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getApplicationClient_EjbReferences());
- result.add(pkg.getApplicationClient_ResourceRefs());
- result.add(pkg.getApplicationClient_ResourceEnvRefs());
- result.add(pkg.getApplicationClient_EnvironmentProps());
- result.add(pkg.getApplicationClient_MessageDestinationRefs());
- result.add(pkg.getApplicationClient_ServiceRefs());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "Create#CHILD_CLASS_NAME#"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return ApplicationProvidersResourceHandler.getString("Create_a_child_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This returns ApplicationClient.gif.
- */
- public Object getImage(Object object) {
- String key = null;
- if (((ApplicationClient) object).eResource() == null)
- return J2EEPlugin.getPlugin().getImage("applclientJAR_obj"); //$NON-NLS-1$
- switch (((ApplicationClient) object).getVersionID()) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- key = "appclient_12"; //$NON-NLS-1$
- break;
- case J2EEVersionConstants.J2EE_1_3_ID :
- key = "appclient_13"; //$NON-NLS-1$
- break;
- case J2EEVersionConstants.J2EE_1_4_ID :
- default :
- key = "appclient_14"; //$NON-NLS-1$
- break;
- }
- return J2EEPlugin.getPlugin().getImage(key);
- }
-
- /**
- * This returns the parent of the ApplicationClient.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ApplicationClient_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ApplicationClient_version_feature", "_UI_ApplicationClient_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ClientPackage.eINSTANCE.getApplicationClient_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Callback Handler feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addCallbackHandlerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ApplicationClient_callbackHandler_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ApplicationClient_callbackHandler_feature", "_UI_ApplicationClient_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ClientPackage.eINSTANCE.getApplicationClient_CallbackHandler(), true));
- }
-
- public String getText(Object object) {
-
- /*
- * String displayName = ((ApplicationClient) object).getDisplayName(); return displayName ==
- * null ? "" ApplicationProvidersResourceHandler.getString(" < <No_display_name>>_ERROR_") :
- * displayName; //$NON-NLS-1$
- */
- ApplicationClient appclient = ((ApplicationClient) object);
- if (appclient.getDisplayName() == null) {
- try {
- IProject project = ProjectUtilities.getProject(appclient);
- return project.getDescription().getName();
- } catch (Exception e) {
- //Ignore
- }
-
- Resource resource = appclient.eResource();
- if (resource != null) {
- return new Path(resource.getURI().toString()).removeFileExtension().lastSegment();
- }
- return ""; //$NON-NLS-1$
- }
- return appclient.getDisplayName();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ApplicationClient.class)) {
- case ClientPackage.APPLICATION_CLIENT__VERSION :
- case ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS :
- case ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS :
- case ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES :
- case ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS :
- case ClientPackage.APPLICATION_CLIENT__SERVICE_REFS :
- case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS :
- case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_ResourceRefs(), CommonFactory.eINSTANCE.createResourceRef()));
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_EnvironmentProps(), CommonFactory.eINSTANCE.createEnvEntry()));
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_EjbReferences(), CommonFactory.eINSTANCE.createEjbRef()));
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_EjbReferences(), CommonFactory.eINSTANCE.createEJBLocalRef()));
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_ResourceEnvRefs(), CommonFactory.eINSTANCE.createResourceEnvRef()));
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_MessageDestinationRefs(), CommonFactory.eINSTANCE.createMessageDestinationRef()));
-
- newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_MessageDestinations(), CommonFactory.eINSTANCE.createMessageDestination()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object) {
- ApplicationClient client = (ApplicationClient) object;
- Collection myChildren = super.getChildren(object);
- myChildren.addAll(client.getMessageDestinations());
- if (client.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- myChildren.addAll(serviceHelper.get13ServiceRefs(client));
- }
- return myChildren;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java
deleted file mode 100644
index 4253a6b..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java
+++ /dev/null
@@ -1,80 +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.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.application.common.CreateChildCommand;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-
-
-
-/**
- * This extended item provider supports the following commands:
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. The commands
- * are implemented uniformly on all our item adapters using this common base class.
- */
-public class ClientItemProviderAdapter extends ItemProviderAdapter implements org.eclipse.jst.j2ee.internal.application.common.CreateChildCommand.Helper {
- /**
- * This creates and instance from an adapter factory and a domain notifier.
- */
- protected ClientItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This implements the default behavior for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- return null;
- }
-
- /**
- * This creates the supported commands.
- */
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- if (commandClass == CreateChildCommand.class) {
- return new CreateChildCommand(editingDomain, (EObject) object, null, this);
- }
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }
-
- /**
- * This returns the default image for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("CreateChild"); //$NON-NLS-1$
- }
-
- /**
- * This returns the default label for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
- }
-
- /**
- * This returns the default help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return ApplicationProvidersResourceHandler.getString("Create_a_new_child_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java
deleted file mode 100644
index 5a5b159..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,180 +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.jst.j2ee.internal.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.client.internal.util.ClientAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class ClientItemProviderAdapterFactory extends ClientAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
- /**
- * This is used to implement {@link #IChangeNotifier}.
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}.
- */
- protected Collection supportedTypes = new ArrayList();
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}instances.
- */
- protected ApplicationClientItemProvider applicationClientItemProvider;
- protected Disposable disposable = new Disposable();
-
- /**
- * This constructs an instance.
- */
- public ClientItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- public Adapter adapt(Notifier target, Object adapterKey) {
- return super.adapt(target, this);
- }
-
- public Object adapt(Object object, Object type) {
- // This is a kludge to deal with enumerators, which crash the doSwitch.
- //
- if (object instanceof EObject && ((EObject) object).eClass() == null) {
- return null;
- }
-
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- public Adapter adaptNew(Notifier target, Object adapterType) {
- Adapter adapter = super.adaptNew(target, adapterType);
- disposable.add(adapter);
- return adapter;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}.
- */
- public Adapter createApplicationClientAdapter() {
- if (applicationClientItemProvider == null) {
- applicationClientItemProvider = new ApplicationClientItemProvider(this);
- }
-
- return applicationClientItemProvider;
- }
-
- public void dispose() {
- disposable.dispose();
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}.
- */
- /*
- * public void fireNotifyChanged(Object object, int eventType, Object feature, Object oldValue,
- * Object newValue, int index) { changeNotifier.fireNotifyChanged(object, eventType, feature,
- * oldValue, newValue, index);
- *
- * if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(object, eventType,
- * feature, oldValue, newValue, index); } }
- */
- /**
- * This returns the root adapter factory that contains this factory.
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java
deleted file mode 100644
index 1edbb7d..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java
+++ /dev/null
@@ -1,166 +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.jst.j2ee.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMap;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}
- * object.
- */
-public class EARProjectMapItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /** Added to generated code */
- protected boolean includeModules = false;
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EARProjectMapItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public EARProjectMapItemProvider(AdapterFactory adapterFactory, boolean includeModules) {
- this(adapterFactory);
- this.includeModules = includeModules;
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- if (includeModules)
- childrenReferences.add(ModulemapPackage.eINSTANCE.getEARProjectMap_Mappings());
- childrenReferences.add(ModulemapPackage.eINSTANCE.getEARProjectMap_UtilityJARMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // TODO: Check the type of the specified child object and return the proper feature to use
- // for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the parent of the EARProjectMap.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns EARProjectMap.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("EARProjectMap"); //$NON-NLS-1$
- }
-
- public String getText(Object object) {
- return ApplicationProvidersResourceHandler.getString("EARProjectMap_UI_"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EARProjectMap.class)) {
- case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
- case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
- */
- /*
- * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
- * Object newValue, int index) { ModulemapPackage pkg = ModulemapPackage.eINSTANCE;; if
- * (!includeModules && feature == pkg.getEARProjectMap_Mappings()) return;
- *
- * if (feature == pkg.getEARProjectMap_Mappings() || feature ==
- * pkg.getEARProjectMap_UtilityJARMappings()) { fireNotifyChanged(notifier, eventType, feature,
- * oldValue, newValue, index); return; } super.notifyChanged(notifier, eventType, feature,
- * oldValue, newValue, index); }
- */
-
- /**
- * This adds to the collection of {@linkcom.ibm.etools.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- if (includeModules)
- newChildDescriptors.add(createChildParameter(modulemapPackage.getEARProjectMap_Mappings(), modulemapPackage.getModuleMapping()));
- newChildDescriptors.add(createChildParameter(modulemapPackage.getEARProjectMap_UtilityJARMappings(), modulemapPackage.getUtilityJARMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java
deleted file mode 100644
index f89be2c..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java
+++ /dev/null
@@ -1,246 +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.jst.j2ee.internal.provider;
-
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-public class J2EEItemProvider extends ItemProvider implements IAdaptable {
-
- protected static final Class IRESOURCE_CLASS = IResource.class;
- protected static final Class IPROJECT_CLASS = IProject.class;
-
-
- /**
- * Constructor for J2EEItemProvider.
- */
- public J2EEItemProvider() {
- super();
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param children
- */
- public J2EEItemProvider(Collection children) {
- super(children);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param text
- */
- public J2EEItemProvider(String text) {
- super(text);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param text
- * @param children
- */
- public J2EEItemProvider(String text, Collection children) {
- super(text, children);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param text
- * @param image
- */
- public J2EEItemProvider(String text, Object image) {
- super(text, image);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param text
- * @param image
- * @param children
- */
- public J2EEItemProvider(String text, Object image, Collection children) {
- super(text, image, children);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param text
- * @param image
- * @param parent
- */
- public J2EEItemProvider(String text, Object image, Object parent) {
- super(text, image, parent);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param text
- * @param image
- * @param parent
- * @param children
- */
- public J2EEItemProvider(String text, Object image, Object parent, Collection children) {
- super(text, image, parent, children);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- */
- public J2EEItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- * @param text
- */
- public J2EEItemProvider(AdapterFactory adapterFactory, String text) {
- super(adapterFactory, text);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- */
- public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image) {
- super(adapterFactory, text, image);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param parent
- */
- public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent) {
- super(adapterFactory, text, image, parent);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- * @param children
- */
- public J2EEItemProvider(AdapterFactory adapterFactory, Collection children) {
- super(adapterFactory, children);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param children
- */
- public J2EEItemProvider(AdapterFactory adapterFactory, String text, Collection children) {
- super(adapterFactory, text, children);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param children
- */
- public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image, Collection children) {
- super(adapterFactory, text, image, children);
- }
-
- /**
- * Constructor for J2EEItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param parent
- * @param children
- */
- public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- protected boolean notificationOn = true;
-
- protected void disableNotification() {
- notificationOn = false;
- }
-
- protected void enableNotification() {
- notificationOn = true;
- }
-
-
- public void fireNotifyChanged(Notification notification) {
- if (notificationOn)
- super.fireNotifyChanged(notification);
- }
-
- public Collection getChildren(Object object) {
- if (children.isEmpty()) {
- try {
- disableNotification();
- initializeChildren();
- } finally {
- enableNotification();
- }
- }
- return children;
- }
-
- protected void initializeChildren() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IRESOURCE_CLASS || adapter == IPROJECT_CLASS)
- return getProjectFromParent();
- return null;
- }
-
- /**
- * @return
- */
- private IProject getProjectFromParent() {
- return ProjectUtilities.getProject(getParent());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java
deleted file mode 100644
index d7c6f84..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java
+++ /dev/null
@@ -1,166 +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.jst.j2ee.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModuleMapping;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}
- * object.
- */
-public class ModuleMappingItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ModuleMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- ModulemapPackage pkg = ModulemapPackage.eINSTANCE;
- ;
-
- // This is for the projectName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Project_Name_1"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_project_name_property_of_the_module_mapping_UI_"), //$NON-NLS-1$
- pkg.getModuleMapping_ProjectName(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the module feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Module_UI_"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_module_of_the_module_mapping_UI_"), //$NON-NLS-1$
- pkg.getModuleMapping_Module(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Project Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addProjectNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ModuleMapping_projectName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ModuleMapping_projectName_feature", "_UI_ModuleMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModulemapPackage.eINSTANCE.getModuleMapping_ProjectName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Module feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addModulePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ModuleMapping_module_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ModuleMapping_module_feature", "_UI_ModuleMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModulemapPackage.eINSTANCE.getModuleMapping_Module(), true));
- }
-
-
- /**
- * This returns the parent of the ModuleMapping.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns ModuleMapping.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("ModuleMapping"); //$NON-NLS-1$
- }
-
- public String getText(Object object) {
- ModuleMapping moduleMapping = ((ModuleMapping) object);
- return ApplicationProvidersResourceHandler.getString("ModuleMapping_UI_") + moduleMapping.getProjectName(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ModuleMapping.class)) {
- case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
- case ModulemapPackage.MODULE_MAPPING__MODULE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
- }
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
- */
- /*
- * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
- * Object newValue, int index) { ModulemapPackage pkg = ModulemapPackage.eINSTANCE;; if (
- * feature == pkg.getModuleMapping_ProjectName() || feature == pkg.getModuleMapping_Module() ) {
- * fireNotifyChanged(notifier, eventType, feature, oldValue, newValue, index); return; }
- * super.notifyChanged(notifier, eventType, feature, oldValue, newValue, index); }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapEditPlugin.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapEditPlugin.java
deleted file mode 100644
index ebf6adf..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapEditPlugin.java
+++ /dev/null
@@ -1,125 +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.jst.j2ee.internal.provider;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactory;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-
-
-
-/**
- * @deprecated Leaving this in for now, to minimize breakage to all the providers; should delete
- * when we regen all providers for mof5
- *
- * This is the central singleton for the modulemap plugin.
- */
-public class ModulemapEditPlugin extends Plugin {
- /**
- * Keep track of the singleton.
- */
- protected static ModulemapEditPlugin plugin;
-
- /**
- * Keep track of the modulemap package.
- */
- protected ModulemapPackage modulemapPackage;
-
- /**
- * Create the instance.
- */
- public ModulemapEditPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
-
- // Remember the static instance.
- //
- plugin = this;
- }
-
- /**
- * Get the one modulemap package.
- */
- public ModulemapPackage getModulemapPackage() {
- return modulemapPackage;
- }
-
- /**
- * Get the one modulemap factory.
- */
- public ModulemapFactory getModulemapFactory() {
- return (ModulemapFactory) modulemapPackage.getEFactoryInstance();
- }
-
- /**
- * Do initialization stuff here.
- */
- public void startup() throws CoreException {
- super.startup();
- modulemapPackage = org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactoryImpl.getPackage();
- }
-
- /**
- * Get the singleton instance.
- */
- public static ModulemapEditPlugin getPlugin() {
- return plugin;
- }
-
- /**
- * Get a .gif from the icons folder.
- */
- public Object getImage(String key) {
- try {
- return new URL(getDescriptor().getInstallURL(), "icons/" + key + ".gif"); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (MalformedURLException exception) {
- System.out.println(ApplicationProvidersResourceHandler.getString("Failed_to_load_image_for_ERROR_") + key + "'"); //$NON-NLS-1$ //$NON-NLS-2$
- exception.printStackTrace();
- }
-
- return null;
- }
-
- /**
- * Get a translated string from the resource bundle.
- */
- public String getString(String key) {
- return getDescriptor().getResourceBundle().getString(key);
- }
-
- /**
- * Get a translated string from the resource bundle, with an object substitution.
- */
- public String getString(String key, Object s1) {
- return MessageFormat.format(getString(key), new Object[]{s1});
- }
-
- /**
- * Get a translated string from the resource bundle, with two object substitutions.
- */
- public String getString(String key, Object s1, Object s2) {
- return MessageFormat.format(getString(key), new Object[]{s1, s2});
- }
-
- /**
- * Get a translated string from the resource bundle, with three object substitutions.
- */
- public String getString(String key, Object s1, Object s2, Object s3) {
- return MessageFormat.format(getString(key), new Object[]{s1, s2, s3});
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java
deleted file mode 100644
index 49bc8c4..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java
+++ /dev/null
@@ -1,137 +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.jst.j2ee.internal.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactory;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This extended item provider supports the following commands:
- * <ul>
- * <li>{@link CreateChildCommand}
- * </ul>
- * <p>
- * The commands are implemented uniformly on all our item adapters using this common base class.
- */
-public class ModulemapItemProviderAdapter extends ItemProviderAdapter {
- /**
- * This is the package for the modulemap model.
- */
- protected static final ModulemapPackage modulemapPackage = (ModulemapPackage) EPackage.Registry.INSTANCE.getEPackage(ModulemapPackage.eNS_URI);
- /**
- * This is the factory for the modulemap model.
- */
- protected static final ModulemapFactory modulemapFactory = modulemapPackage.getModulemapFactory();
-
- /**
- * This creates an instance from an adapter factory and a domain notifier.
- */
- protected ModulemapItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates the supported commands.
- */
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }
-
- /**
- * This is a convenience method for creating <code>CommandParameter</code> s for a given
- * parent feature and child type (MOF meta-object).
- */
- protected CommandParameter createChildParameter(EReference feature, EObject childType) {
- return new CommandParameter(null, feature, modulemapFactory.create(childType.eClass()));
- }
-
- /**
- * This returns the default owner object for {@link CreateChildCommand}.
- */
- public Object getCreateChildOwner(Object parent) {
- return parent;
- }
-
- /**
- * This returns the default result collection for {@link CreateChildCommand}.
- */
- public Collection getCreateChildResult(Object child) {
- Collection result = new ArrayList(1);
- result.add(child);
- return result;
- }
-
- /**
- * This returns the default label for {@link CreateChildCommand}.
- */
- public String getCreateChildText(Object parent, Object feature, Object child) {
- return J2EEPlugin.getPlugin().getString("_UI_CreateChild_text"); //$NON-NLS-1$
- }
-
- /**
- * This returns the default description for {@link CreateChildCommand}.
- */
- public String getCreateChildDescription(Object parent, Object feature, Object child) {
- return J2EEPlugin.getPlugin().getString("_UI_CreateChild_description"); //$NON-NLS-1$
- }
-
- /**
- * This returns the default help text for {@link CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object parent, Object feature, Object child) {
- return J2EEPlugin.getPlugin().getString("_UI_CreateChild_tooltip"); //$NON-NLS-1$
- }
-
- /**
- * This returns the default image for {@link CreateChildCommand}.
- */
- public Object getCreateChildImage(Object parent, Object feature, Object child) {
- Object image = null;
-
- if (parent instanceof EObject && child instanceof EObject) {
- String name = ((EObject) parent).eClass().getName() + "Create" + ((EObject) child).eClass().getName(); //$NON-NLS-1$
- image = J2EEPlugin.getPlugin().getImage(name);
- }
- return image;
- }
-
- /**
- * This looks up the name of the type of the specified object.
- */
- protected String getTypeText(Object object) {
- String typeKey = object instanceof EObject ? ((EObject) object).eClass().getName() : "Unknown"; //$NON-NLS-1$
- return J2EEPlugin.getPlugin().getString("_UI_" + typeKey + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This looks up the name of the specified feature.
- */
- protected String getFeatureText(Object feature) {
- String featureKey = feature instanceof EReference ? ((EReference) feature).getName() : "Unknown"; //$NON-NLS-1$
- return J2EEPlugin.getPlugin().getString("_UI_" + featureKey + "_feature"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java
deleted file mode 100644
index bc415ac..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,215 +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.jst.j2ee.internal.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapAdapterFactory;
-
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class ModulemapItemProviderAdapterFactory extends ModulemapAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link #com.ibm.etools.emf.edit.provider.IChangeNotifier}.
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}.
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance.
- */
- public ModulemapItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}
- * instances.
- */
- protected ModuleMappingItemProvider moduleMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}.
- */
- public Adapter createModuleMappingAdapter() {
- if (moduleMappingItemProvider == null) {
- moduleMappingItemProvider = new ModuleMappingItemProvider(this);
- }
-
- return moduleMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}
- * instances.
- */
- protected EARProjectMapItemProvider earProjectMapItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}.
- */
- public Adapter createEARProjectMapAdapter() {
- if (earProjectMapItemProvider == null) {
- earProjectMapItemProvider = new EARProjectMapItemProvider(this);
- }
-
- return earProjectMapItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}
- * instances.
- */
- protected UtilityJARMappingItemProvider utilityJARMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}.
- */
- public Adapter createUtilityJARMappingAdapter() {
- if (utilityJARMappingItemProvider == null) {
- utilityJARMappingItemProvider = new UtilityJARMappingItemProvider(this);
- }
-
- return utilityJARMappingItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- public Object adapt(Object object, Object type) {
- // This is a kludge to deal with enumerators, which crash the doSwitch.
- //
- if (object instanceof EObject && ((EObject) object).eClass() == null) {
- return null;
- }
-
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}.
- */
- /*
- * public void fireNotifyChanged(Object object, int eventType, Object feature, Object oldValue,
- * Object newValue, int index) { changeNotifier.fireNotifyChanged(object, eventType, feature,
- * oldValue, newValue, index);
- *
- * if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(object, eventType,
- * feature, oldValue, newValue, index); } }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java
deleted file mode 100644
index 6cf3c10..0000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java
+++ /dev/null
@@ -1,191 +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.jst.j2ee.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}
- * object.
- */
-public class UtilityJARMappingItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public UtilityJARMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- ModulemapPackage pkg = ModulemapPackage.eINSTANCE;
- ;
-
- // This is for the projectName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Project_Name_UI_"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_project_name_property_of_the_utility_jar_mapping_UI_"), //$NON-NLS-1$
- pkg.getUtilityJARMapping_ProjectName(), false, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the uri feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Uri_UI_"), //$NON-NLS-1$
- ApplicationProvidersResourceHandler.getString("The_uri_property_of_the_utility_jar_mapping_UI_"), //$NON-NLS-1$
- pkg.getUtilityJARMapping_Uri(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Project Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addProjectNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UtilityJARMapping_projectName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UtilityJARMapping_projectName_feature", "_UI_UtilityJARMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModulemapPackage.eINSTANCE.getUtilityJARMapping_ProjectName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Uri feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUriPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UtilityJARMapping_uri_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UtilityJARMapping_uri_feature", "_UI_UtilityJARMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModulemapPackage.eINSTANCE.getUtilityJARMapping_Uri(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns the parent of the UtilityJARMapping.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns UtilityJARMapping.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("icons/full/obj16/prjutiljar_obj"); //$NON-NLS-1$
- }
-
- // /**
- // * @param object
- // * @return
- // */
- // private boolean isEJBClientJAR(Object object) {
- // UtilityJARMapping map = (UtilityJARMapping) object;
- // IProject project = ProjectUtilities.getProject(map);
- // if (project == null)
- // return false;
- //
- // EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
- // if (runtime == null)
- // return false;
- //
- // EAREditModel model = null;
- // try {
- // model = runtime.getEarEditModelForRead(this);
- // return model.isEjbClientJarMapping(map);
- // } finally {
- // if (model != null)
- // model.releaseAccess(this);
- // }
- // }
-
- public String getText(Object object) {
- UtilityJARMapping map = ((UtilityJARMapping) object);
- return map == null ? "<??>" : map.getUri(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(UtilityJARMapping.class)) {
- case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
- case ModulemapPackage.UTILITY_JAR_MAPPING__URI : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
- }
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
- */
- /*
- * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
- * Object newValue, int index) { ModulemapPackage pkg = ModulemapPackage.eINSTANCE;; if (
- * feature == pkg.getUtilityJARMapping_ProjectName() || feature ==
- * pkg.getUtilityJARMapping_Uri() ) { fireNotifyChanged(notifier, eventType, feature, oldValue,
- * newValue, index); return; } super.notifyChanged(notifier, eventType, feature, oldValue,
- * newValue, index); }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAddWebComponentToEnterpriseApplicationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAddWebComponentToEnterpriseApplicationDataModelProperties.java
deleted file mode 100644
index 45d5e29..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAddWebComponentToEnterpriseApplicationDataModelProperties.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.datamodel.properties;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-
-public interface IAddWebComponentToEnterpriseApplicationDataModelProperties extends ICreateReferenceComponentsDataModelProperties{
-
- public static final String CONTEXT_ROOT = "IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentCreationDataModelProperties.java
deleted file mode 100644
index aa78571..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,40 +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.jst.j2ee.datamodel.properties;
-
-/**
- * <p>
- * IAppClientComponentCreationDataModelProperties provides properties to the
- * AppClientComponentCreationDataModelProvider as well as all extending interfaces extending
- * IEjbComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-
-public interface IAppClientComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties {
- /**
- * Optional, type Boolean. the default value is <code>Boolean.TRUE</code>.If this is true and CREATE_DEFAULT_FILES is true, then a default main
- * class will be generated during component creation.
- */
- public static final String CREATE_DEFAULT_MAIN_CLASS = "IAppClientComponentCreationDataModelProperties.CREATE_DEFAULT_MAIN_CLASS"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentExportDataModelProperties.java
deleted file mode 100644
index 00fa5d0..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,30 +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.jst.j2ee.datamodel.properties;
-/**
- * <p>
- * IAppClientComponentExportDataModelProperties provides properties to the IDataModel associated with the
- * AppClientComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IAppClientComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentImportDataModelProperties.java
deleted file mode 100644
index f2895dc..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,31 +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.jst.j2ee.datamodel.properties;
-
-/**
- * <p>
- * IAppClientComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * AppClientComponentImportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IAppClientComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentExportDataModelProperties.java
deleted file mode 100644
index d6e8b1a..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,30 +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.jst.j2ee.datamodel.properties;
-/**
- * <p>
- * IEARComponentExportDataModelProperties provides properties to the DataModel associated with the
- * EARComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IEARComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentImportDataModelProperties.java
deleted file mode 100644
index c30fa4a..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,79 +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.jst.j2ee.datamodel.properties;
-
-/**
- * <p>
- * IEARComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * EARComponentImportDataModelProvider. NOTE: The associated Provider and Operations will be created
- * during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IEARComponentImportDataModelProperties extends IJ2EEComponentImportDataModelProperties {
-
- /**
- * Optional, type IPath default is ear location
- */
- public static final String NESTED_MODULE_ROOT = "IEnterpriseApplicationImportDataModelProperties.NESTED_MODULE_ROOT"; //$NON-NLS-1$
-
- /**
- * Optional, A List containing utililty jars. This list should consist of the CommonArchive
- * Archives of all the Utility Jars that should be extracted into projects.
- */
- public static final String UTILITY_LIST = "IEnterpriseApplicationImportDataModelProperties.UTILITY_LIST"; //$NON-NLS-1$
- /**
- * Optional, A List containing modules to be imported list;
- */
- public static final String SELECTED_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.SELECTED_MODELS_LIST"; //$NON-NLS-1$
- /**
- * Optional, A List containing ejb client jars associated with any ejb components which are to
- * be imported.
- */
- public static final String EJB_CLIENT_LIST = "IEnterpriseApplicationImportDataModelProperties.EJB_CLIENT_LIST"; //$NON-NLS-1$
-
- /**
- * Optional. This is a list of data models. This list must contain all non-utilty projects in
- * the ear to be imported
- */
- public static final String MODULE_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.MODULE_MODELS_LIST"; //$NON-NLS-1$
-
- /**
- * Optional. This is a list of data models. This list must contain all utility jars selected to
- * be imported
- */
- public static final String UTILITY_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.UTILITY_MODELS_LIST"; //$NON-NLS-1$
-
- /**
- * This is an unsettable property which will return all the project DataModels.
- */
- public static final String ALL_PROJECT_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.ALL_PROJECT_MODELS_LIST"; //$NON-NLS-1$
-
- /**
- * This is an unsettable property which will return .
- */
- public static final String UNHANDLED_PROJECT_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.UNHANDLED_PROJECT_MODELS_LIST"; //$NON-NLS-1$
-
- /**
- * This is an unsettable property which will return .
- */
- public static final String HANDLED_PROJECT_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.HANDLED_PROJECT_MODELS_LIST"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEarComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEarComponentCreationDataModelProperties.java
deleted file mode 100644
index 11a691f..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEarComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,41 +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.jst.j2ee.datamodel.properties;
-
-/**
- * <p>
- * IEarComponentCreationDataModelProperties provides properties to the
- * EarComponentCreationDataModelProvider as well as all extending interfaces extending
- * IEarComponentCreationDataModelProperties
- *
- * @see org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-public interface IEarComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties {
- /**
- * A java.util.List of IProject J2EEModules which are to be added to the EAR.
- */
- public static final String J2EE_PROJECTS_LIST = "IEarComponentCreationDataModel.J2EE_PROJECTS_LIST"; //$NON-NLS-1$
- public static final String JAVA_PROJECT_LIST = "IEarComponentCreationDataModel.JAVA_PROJECT_LIST"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java
deleted file mode 100644
index 48265a5..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.datamodel.properties;
-
-
-
-/**
- * <p>
- * IJ2EEComponentCreationDataModelProperties provides properties to the
- * J2EEComponentCreationDataModelProvider as well as all extending interfaces extending
- * IJ2EEComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-public interface IJ2EEComponentCreationDataModelProperties extends IJavaComponentCreationDataModelProperties{
-
- /**
- * Required, type Boolean, the default value is <code>Boolean.FALSE</code>.
- */
- public static final String ADD_TO_EAR = "IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-
- public static final String MODULE_URI = "IJ2EEComponentCreationDataModelProperties.MODULE_URI"; //$NON-NLS-1$
- /**
- * type String, this property needs to be set if the value of the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>
- */
- public static final String EAR_COMPONENT_NAME = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * type String, this property needs to be set if the value of the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>
- */
- public static final String EAR_COMPONENT_DEPLOY_NAME = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_DEPLOY_NAME"; //$NON-NLS-1$
- /**
- * type ComponentHandle, this property needs to be set if the value of the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>. Represents
- * a handle to the EAR
- */
- public static final String EAR_COMPONENT_PROJECT = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT"; //$NON-NLS-1$
-
- /**
- * type Boolean; the default value is <code>Boolean.TRUE</code>, this is UI only property
- */
- public static final String UI_SHOW_EAR_SECTION = "IJ2EEComponentCreationDataModelProperties.UI_SHOW_EAR_SECTION"; //$NON-NLS-1$
-
- /**
- * Optional, type String
- * String indicates the name of the the folder where the deployment descriptor exists.
- * Each J2EE componenr provider will default the Deployment descriptor folder.
- *
- */
-
- public static final String DD_FOLDER = "IJ2EEComponentCreationDataModelProperties.DD_FOLDER"; //$NON-NLS-1$
-
- /**
- * Required, type Integer. The user defined version of the component.
- */
- public static final String COMPONENT_VERSION = "IComponentCreationDataModelProperties.COMPONENT_VERSION"; //$NON-NLS-1$
-
- /**
- * type Integer
- */
- public static final String VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME = "IComponentCreationDataModelProperties.VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME"; //$NON-NLS-1$
- /**
- * type AddComponentToEnterpriseApplicationDataModel
- */
- public static final String NESTED_ADD_COMPONENT_TO_EAR_DM = "IComponentCreationDataModelProperties.NESTED_ADD_COMPONENT_TO_EAR_DM"; //$NON-NLS-1$
- /**
- * type EARComponentCreationDataModel
- */
- public static final String NESTED_EAR_COMPONENT_CREATION_DM = "IComponentCreationDataModelProperties.NESTED_EAR_COMPONENT_CREATION_DM"; //$NON-NLS-1$
- /**
- * type UpdateManifestDataModel
- */
- public static final String NESTED_UPDATE_MANIFEST_DM = "IComponentCreationDataModelProperties.NESTED_UPDATE_MANIFEST_DM"; //$NON-NLS-1$
- /**
- * type ClassPathSelection
- */
- public static final String CLASSPATH_SELECTION = "IComponentCreationDataModelProperties.CLASSPATH_SELECTION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentExportDataModelProperties.java
deleted file mode 100644
index c5b69a6..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,64 +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.jst.j2ee.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-/**
- * <p>
- * IJ2EEComponentExportDataModelProperties provides properties to the IDataModel associated with the
- * J2EEComponentExportDataModelProvider as well as all extending interfaces extending
- * IJ2EEComponentExportDataModelProperties specifically all J2EE component specific exports.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IJ2EEComponentExportDataModelProperties extends IDataModelProperties {
-
- /**
- * Required, type String. The user defined name of the component to be exported.
- */
- public static final String COMPONENT_NAME = "IJ2EEComponentExportDataModelProperties.COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * Required, type String. The user defined name of the component to be exported.
- */
- public static final String PROJECT_NAME = "IJ2EEComponentExportDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
- /**
- * Required, type IPath. The user defined export location including fully qualified Path and archive file
- * to be created name.
- */
- public static final String ARCHIVE_DESTINATION = "IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION"; //$NON-NLS-1$
- /**
- * Optional, type Boolean. If <code>Boolean.TRUE</code> source and class fields will both be archived and exported.
- * Otherwise if <code>Boolean.FALSE</code> only output files are exported.
- */
- public static final String EXPORT_SOURCE_FILES = "IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES"; //$NON-NLS-1$
- /**
- * Optional, type Boolean. If <code>Boolean.TRUE</code> and an archive with the same name exists in the
- * ARCHIVE_DESTINATION, the existing will be overwritten by the archive to be created. Otherwise,
- * if <code>Boolean.FALSE</code> a error message will be show indicating name collisions.
- */
- public static final String OVERWRITE_EXISTING = "IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING"; //$NON-NLS-1$
- /**
- * Optional, type boolean, Default <code>Boolean.TRUE</code> indicating a Build runs before exporting thus output files are created
- * and archived. However, if <code>Boolean.FALSE</code> the component is archived as is.
- */
- public static final String RUN_BUILD = "IJ2EEComponentExportDataModelProperties.RUN_BUILD"; //$NON-NLS-1$}
-
- public static final String COMPONENT = "IJ2EEComponentExportDataModelProperties.COMPONENT"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentImportDataModelProperties.java
deleted file mode 100644
index 9cc72c4..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,87 +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.jst.j2ee.datamodel.properties;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-/**
- * <p>
- * IJ2EEComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * J2EEComponentImportDataModelProvider as well as all extending interfaces extending
- * IJ2EEComponentImportDataModelProperties specifically all J2EE component specific imports.
- *
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-
-public interface IJ2EEComponentImportDataModelProperties extends IDataModelProperties {
-
- /**
- * Required, type String, name of the file to be imported.
- */
- public static final String FILE_NAME = "IJ2EEArtifactImportDataModelProperties.FILE_NAME"; //$NON-NLS-1$
-
- /**
- * Optional, type Archive, used when a file is available as an object rather than a url (i.e.
- * using the FILE_NAME property will not work).
- */
- public static final String FILE = "IJ2EEArtifactImportDataModelProperties.FILE"; //$NON-NLS-1$
- /**
- * Required, type String, name of the Project which the Archive will be imported.
- */
- public static final String PROJECT_NAME = IComponentCreationDataModelProperties.PROJECT_NAME;
-
- /**
- * Required, type String, name of the Component which will be created to house the Archive
- */
- public static final String COMPONENT_NAME = IComponentCreationDataModelProperties.COMPONENT_NAME;
-
- /**
- * Unsettable property used to retreive the component after the operation has executed.
- */
- public static final String COMPONENT = IComponentCreationDataModelProperties.COMPONENT;
- /**
- * Optional, type IOverwriteHandler. Defines a IOverwriteHandler for the component in the
- * workspace if an existing component should be overwritten (OVERWRITE_COMPONENT).
- */
- public static final String OVERWRITE_HANDLER = "IJ2EEArtifactImportDataModelProperties.OVERWRITE_HANDLER"; //$NON-NLS-1$
-
- /**
- * Optional, type SaveFilter, default is null
- */
- public static final String SAVE_FILTER = "IJ2EEArtifactImportDataModelProperties.SAVE_FILTER"; //$NON-NLS-1$
-
- /**
- * Optional, type Boolean - Should the archive be closed on dispose?
- */
- public static final String CLOSE_ARCHIVE_ON_DISPOSE = "IJ2EEArtifactImportDataModelProperties.closeArchiveOnDispose"; //$NON-NLS-1$
- /**
- * Optional - type List, populated list of files previously selected. This can be used for GUIs
- * which wish to show preivous selections.
- */
- public static final String FILE_SELECTION_HISTORY = "IJ2EEArtifactImportDataModelProperties.FILE_SELECTION_HISTORY"; //$NON-NLS-1$
- /**
- * Optional, type IDataModel. This IDataModel will have a J2EE specific component creation
- * provider associated with it.
- */
- public static final String NESTED_MODEL_J2EE_COMPONENT_CREATION = "IJ2EEArtifactImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java
deleted file mode 100644
index 3a8f005..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java
+++ /dev/null
@@ -1,46 +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.jst.j2ee.datamodel.properties;
-
-/**
- * <p>
- * IJ2EEModuleImportDataModelProperties provides properties to the IDataModel associated with the
- * J2EEModuleImportDataModelProvider as well as all extending interfaces extending
- * IJ2EEModuleImportDataModelProperties specifically all J2EE component specific imports.
- *
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IJ2EEModuleImportDataModelProperties extends IJ2EEComponentImportDataModelProperties {
- /**
- * Optional, type String. This property is nested from the J2EEComponentCreationDataModel and set only if user is attempting to add the component to an EAR.
- * Some J2EE components such as Web do not require an EAR.
- */
- public static final String EAR_COMPONENT_NAME = IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME;
- /**
- * Optional, type Boolean. This property defaults to True, but changes if user wishs to import a component
- * without adding it to an EAR.
- */
- public static final String ADD_TO_EAR = IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR;
-
- public static final String EXTENDED_IMPORT_FACTORY = "IJ2EEModuleImportDataModelProperties.EXTENDED_IMPORT_FACTORY"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEUtilityJarListImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEUtilityJarListImportDataModelProperties.java
deleted file mode 100644
index 631e003..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEUtilityJarListImportDataModelProperties.java
+++ /dev/null
@@ -1,72 +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.jst.j2ee.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface IJ2EEUtilityJarListImportDataModelProperties extends IDataModelProperties{
-
- /**
- * Required. The EAR Project to which Utility Jars should be added.
- */
- public static final String EAR_PROJECT = IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME;
-
- /**
- * Optional. Boolean Property. True indicates to create a Project Can be used with
- * LINK_IMPORT="true|"false" or BINARY_IMPORT="true|false" The default value is true.
- */
- public static final String CREATE_PROJECT = "J2EEUtilityJarListImportDataModel.CREATE_PROJECT"; //$NON-NLS-1$
-
- /**
- * Optional. Boolean property. True indicates to import the jar as a linked project Can be
- * specified with BINARY_IMPORT="true|false" and/or CREATE_PROJECT="true|false" The default
- * value is false.
- */
- public static final String LINK_IMPORT = "J2EEUtilityJarListImportDataModel.LINK_IMPORT"; //$NON-NLS-1$
-
- /**
- * Optional. Boolean Property. True indicates to create a Project Can be used with
- * LINK_IMPORT="true|"false" or BINARY_IMPORT="true|false" The default value is true.
- */
- public static final String CREATE_LINKED_PROJECT = "J2EEUtilityJarListImportDataModel.CREATE_LINKED_PROJECT"; //$NON-NLS-1$
-
- /**
- * Optional. Boolean property. True indicates to import the jar as a linked project Can be
- * specified with BINARY_IMPORT="true|false" and/or CREATE_PROJECT="true|false" The default
- * value is false.
- */
- public static final String COPY = "J2EEUtilityJarListImportDataModel.COPY"; //$NON-NLS-1$
-
- /**
- * Optional. Boolean property. True indicates to import the jar as a binary project Can be
- * specified with LINK_IMPORT="true|false" and/or CREATE_PROJECT="true|false" The default value
- * is false.
- */
- public static final String BINARY_IMPORT = "J2EEUtilityJarListImportDataModel.BINARY_IMPORT"; //$NON-NLS-1$
-
- /**
- * Required. A java.util.List of fully qualified file names for each Utility Jar that should be
- * imported.
- */
- public static final String UTILITY_JAR_LIST = "J2EEUtilityJarListImportDataModel.UTILITY_JAR_LIST"; //$NON-NLS-1$
-
- public static final String AVAILABLE_JARS_DIRECTORY = "J2EEUtilityJarListImportDataModel.AVAILABLE_JARS_DIRECTORY"; //$NON-NLS-1$
-
- public static final String PROJECT_ROOT = "J2EEUtilityJarListImportDataModel.PROJECT_ROOT"; //$NON-NLS-1$
-
- public static final String OVERRIDE_PROJECT_ROOT = "J2EEUtilityJarListImportDataModel.OVERRIDE_PROJECT_ROOT"; //$NON-NLS-1$
-
- public static final String OVERWRITE_IF_NECESSARY = "J2EEUtilityJarListImportDataModel.OVERWRITE_IF_NECESSARY"; //$NON-NLS-1$
-
- public static final String CREATE_LINKED_PATH_VARIABLE = "J2EEUtilityJarListImportDataModel.CREATE_LINKED_PATH"; //$NON-NLS-1$
-
- public static final String LINKED_PATH_VARIABLE = "J2EEUtilityJarListImportDataModel.LINKED_PATH_VARIABLE"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java
deleted file mode 100644
index d626b33..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.datamodel.properties;
-
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-
-/**
- * <p>
- * IJavaComponentCreationDataModelProperties provides properties to the
- * JavaComponentCreationDataModelProvider as well as all extending interfaces extending
- * IJavaComponentCreationDataModelProperties specifically, but not limited to all J2EE component related
- * creation.
- * @see org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IJavaComponentCreationDataModelProperties extends IComponentCreationDataModelProperties {
- /**
- * Optional, type String
- * String indicating the name of the the root Java Source Folder in the component being created.
- * The DataModelProvider will default the Java Source Folder to the Component folder.
- *
- */
- public static final String JAVASOURCE_FOLDER = "IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER";
- /**
- * Optional, type String
- * String indicating the name of the the root folder containing the Manifest.MF in the component being created.
- * The DataModelProvider will default the Manifest folder to the Component folder/META-INF.
- */
- public static final String MANIFEST_FOLDER = "IJavaComponentCreationDataModelProperties.MANIFEST_FOLDER";
-
- /**
- * Required, type String. This is used to specify the server target.
- *
- */
- public static final String RUNTIME_TARGET_ID = IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID;
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaUtilityJarImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaUtilityJarImportDataModelProperties.java
deleted file mode 100644
index 425a5f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaUtilityJarImportDataModelProperties.java
+++ /dev/null
@@ -1,40 +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.jst.j2ee.datamodel.properties;
-/**
- * <p>
- * IJavaUtilityJarImportDataModelProperties provides properties to the IDataModel associated with the
- * JavaUtilityJarImportDataModelProvider.
- *
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IJavaUtilityJarImportDataModelProperties extends IJ2EEComponentImportDataModelProperties {
- /**
- * Required, type String. Represents the name of the Project containing the EAR component, which the utility
- * jar will be added.
- */
- public static final String EAR_PROJECT_NAME = "J2EEUtilityJarImportDataModel.EAR_PROJECT_NAME"; //$NON-NLS-1$
- /**
- * Required, type String. Represents the name of the EAR component which the utility jar will be added.
- */
- public static final String EAR_COMPONENT_NAME = "J2EEUtilityJarImportDataModel.EAR_PROJECT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IUtilityJavaComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IUtilityJavaComponentCreationDataModelProperties.java
deleted file mode 100644
index 36492b9..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IUtilityJavaComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,41 +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.jst.j2ee.datamodel.properties;
-
-
-/**
- * <p>
- * IJavaComponentCreationDataModelProperties provides properties to the
- * JavaComponentCreationDataModelProvider as well as all extending interfaces extending
- * IJavaComponentCreationDataModelProperties specifically, but not limited to all J2EE component related
- * creation.
- * @see org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IUtilityJavaComponentCreationDataModelProperties extends IJavaComponentCreationDataModelProperties {
- /**
- * Optional, type String
- * String indicating the name of the the root Java Source Folder in the component being created.
- * The DataModelProvider will default the Java Source Folder to the Component folder.
- *
- */
- public static final String EAR_PROJECT_NAME = "IUtilityJavaComponentCreationDataModelProperties.EAR_PROJECT_NAME";
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/package.xml b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/package.xml
deleted file mode 100644
index 3bf43aa..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>j2ee module common data model api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the api the common create, import and export j2ee modules. It also includes the enterprise application and applciation client creation, import and export api. The interfaces in this package
- define the properties that can be set on the j2ee modules data models that are used to run the data model operations and drive the wizard data, validation.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientArchiveOpsResourceHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientArchiveOpsResourceHandler.java
deleted file mode 100644
index 8111e91..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientArchiveOpsResourceHandler.java
+++ /dev/null
@@ -1,40 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AppClientArchiveOpsResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "appclientarchiveops";//$NON-NLS-1$
-
- private AppClientArchiveOpsResourceHandler() {
- // Do not instantiate
- }
-
- public static String ARCHIVE_OPERATION_SaveFile;
- public static String ARCHIVE_OPERATION_ProjectNature;
- public static String ARCHIVE_OPERATION_SaveManifest;
- public static String ARCHIVE_OPERATION_FileNotFound;
- public static String ARCHIVE_OPERATION_OpeningArchive;
- public static String ARCHIVE_OPERATION_ImportOperation;
- public static String IMPORT_MOFRESOURCE_STRING;
- public static String APPCLIENT_IMPORT_OPERATION_STRING;
- public static String APPCLIENT_IMPORT_FILE_STRING;
- public static String APPCLIENT_IMPORT_ERROR;
- public static String ARCHIVE_OPERATION_ErrorOccured;
- public static String Application_Client_File_UI_;
- public static String _c__Copyright_IBM_Corporation_2001_1;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AppClientArchiveOpsResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentExportOperation.java
deleted file mode 100644
index 706eeec..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentExportOperation.java
+++ /dev/null
@@ -1,46 +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.jst.j2ee.internal.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentExportOperation extends J2EEArtifactExportOperation {
-
- public AppClientComponentExportOperation(IDataModel model) {
- super(model);
- }
-
- public void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
- try {
- CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
- AppClientComponentLoadStrategyImpl ls = new AppClientComponentLoadStrategyImpl(getComponent());
- ls.setExportSource(isExportSource());
- setModuleFile(caf.openApplicationClientFile(ls, getDestinationPath().toOSString()));
- getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
- } catch (SaveFailureException ex) {
- throw ex;
- } catch (Exception e) {
- throw new SaveFailureException(AppClientArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
- }
- }
-
- protected String archiveString() {
- return AppClientArchiveOpsResourceHandler.Application_Client_File_UI_;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentImportOperation.java
deleted file mode 100644
index 5f88a95..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentImportOperation.java
+++ /dev/null
@@ -1,28 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentImportOperation extends J2EEArtifactImportOperation {
-
- public AppClientComponentImportOperation(IDataModel model) {
- super(model);
- }
-
- protected SaveStrategy createSaveStrategy(IVirtualComponent virtualComponent) {
- AppClientComponentSaveStrategyImpl saveStrat = new AppClientComponentSaveStrategyImpl(virtualComponent);
- return saveStrat;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentLoadStrategyImpl.java
deleted file mode 100644
index 9534444..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClientComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
- public AppClientComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentSaveStrategyImpl.java
deleted file mode 100644
index 7c769bd..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClientComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
- public AppClientComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java
deleted file mode 100644
index 1eca0da..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,484 +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.jst.j2ee.internal.archive.operations;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-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.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.internal.emf.utilities.ExtendedEcoreUtil;
-
-public abstract class ComponentLoadStrategyImpl extends LoadStrategyImpl {
-
- protected IVirtualComponent vComponent;
- protected boolean exportSource;
- private List zipFiles = new ArrayList();
-
- protected class FilesHolder {
-
- private Map urisToFiles = new HashMap();
- private Map urisToResources = new HashMap();
- private Map resourcesToURI = new HashMap();
- private Map urisToDiskFiles;
- private Map urisToZipEntry = new HashMap();
-
- public void removeIFile(IFile file) {
- String uri = (String) resourcesToURI.get(file);
- remove(uri);
- }
-
- public void remove(String uri) {
- urisToFiles.remove(uri);
- Object resource = urisToResources.remove(uri);
- if (resource != null) {
- resourcesToURI.remove(resource);
- }
- if (urisToDiskFiles != null) {
- urisToDiskFiles.remove(uri);
- }
- }
-
- public void addDirectory(File directory) {
- String uri = directory.getURI();
- urisToFiles.put(uri, directory);
- }
-
- public void addFile(File file) {
- String uri = file.getURI();
- urisToFiles.put(uri, file);
- }
-
- public void addFile(File file, java.io.File externalDiskFile) {
- String uri = file.getURI();
- urisToFiles.put(uri, file);
- if (null == urisToDiskFiles) {
- urisToDiskFiles = new HashMap();
- }
- urisToDiskFiles.put(uri, externalDiskFile);
- }
-
- public void addFile(File file, IResource resource) {
- String uri = file.getURI();
- urisToFiles.put(uri, file);
- urisToResources.put(uri, resource);
- }
-
- public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
- java.io.File diskFile = null;
-
- if (urisToDiskFiles != null && urisToDiskFiles.containsKey(uri)) {
- diskFile = (java.io.File) urisToDiskFiles.get(uri);
- } else if (urisToResources != null && urisToResources.containsKey(uri)) {
- IResource resource = (IResource) urisToResources.get(uri);
- diskFile = new java.io.File(resource.getLocation().toOSString());
- } else {
- Map fileURIMap = (Map) urisToZipEntry.get(uri);
- Iterator it = fileURIMap.keySet().iterator();
-
- String sourceFileUri = ""; //$NON-NLS-1$
- ZipFile zipFile = null;
-
- // there is only one key, pair
- while (it.hasNext()) {
- sourceFileUri = (String) it.next();
- zipFile = (ZipFile) fileURIMap.get(sourceFileUri);
- }
- ZipEntry entry = zipFile.getEntry(sourceFileUri);
- InputStream in = zipFile.getInputStream(entry);
- return in;
- }
- return new FileInputStream(diskFile);
- }
-
- public List getFiles() {
- return new ArrayList(urisToFiles.values());
- }
-
- public boolean contains(String uri) {
- return urisToFiles.containsKey(uri);
- }
-
- public void addEntry(ZipEntry entry, ZipFile zipFile, IPath runtimePath) {
- String uri = runtimePath == null ? null : runtimePath.toString();
- String fileURI = ""; //$NON-NLS-1$
- if (uri != null) {
- if (!uri.equals("/")) //$NON-NLS-1$
- fileURI = uri + entry.getName();
- else
- fileURI = entry.getName();
- } else {
- fileURI = entry.getName();
- }
-
- File file = createFile(fileURI);
-
- Map fileURIMap = new HashMap();
- fileURIMap.put(entry.getName(), zipFile);
-
- urisToZipEntry.put(file.getURI(), fileURIMap);
- urisToFiles.put(file.getURI(), file);
- }
- }
-
- protected FilesHolder filesHolder;
-
- public ComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- this.vComponent = vComponent;
- filesHolder = new FilesHolder();
- }
-
- public boolean contains(String uri) {
- IVirtualFolder rootFolder = vComponent.getRootFolder();
- return rootFolder.getFile(new Path(uri)).exists();
- }
-
- protected void initializeResourceSet() {
- resourceSet = WorkbenchResourceHelperBase.getResourceSet(vComponent.getProject());
- }
-
- protected boolean primContains(String uri) {
- return false;
- }
-
- public List getFiles() {
- aggregateSourceFiles();
- aggregateClassFiles();
- addUtilities();
- return filesHolder.getFiles();
- }
-
- protected void addUtilities() {
- IVirtualReference[] components = vComponent.getReferences();
- for (int i = 0; i < components.length; i++) {
- IVirtualReference reference = components[i];
- IVirtualComponent referencedComponent = reference.getReferencedComponent();
-
- if (referencedComponent.isBinary() && reference.getDependencyType() == DependencyType.CONSUMES) {
- java.io.File diskFile = ((VirtualArchiveComponent) referencedComponent).getUnderlyingDiskFile();
- ZipFile zipFile;
- IPath path = reference.getRuntimePath();
- try {
- zipFile = new ZipFile(diskFile);
- zipFiles.add(zipFile);
- Enumeration enumeration = zipFile.entries();
- while (enumeration.hasMoreElements()) {
- ZipEntry entry = (ZipEntry) enumeration.nextElement();
- filesHolder.addEntry(entry, zipFile, path);
- }
- } catch (ZipException e) {
- Logger.getLogger().logError(e);
- } catch (IOException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
-
- protected void aggregateSourceFiles() {
- try {
- IVirtualFolder rootFolder = vComponent.getRootFolder();
- IVirtualResource[] members = rootFolder.members();
- aggregateFiles(members);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- protected void aggregateClassFiles() {
- StructureEdit se = null;
- try {
- IPackageFragmentRoot[] sourceRoots = J2EEProjectUtilities.getSourceContainers(vComponent.getProject());
- se = StructureEdit.getStructureEditForRead(vComponent.getProject());
- for (int i = 0; i < sourceRoots.length; i++) {
- IPath outputPath = sourceRoots[i].getRawClasspathEntry().getOutputLocation();
- if (outputPath == null) {
- IProject project = vComponent.getProject();
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
- outputPath = javaProject.getOutputLocation();
- }
- }
-
- if (outputPath != null) {
- IContainer javaOutputFolder = (IContainer) ResourcesPlugin.getWorkspace().getRoot().findMember(outputPath);
- IPath runtimePath = null;
- try {
- ComponentResource[] componentResources = se.findResourcesBySourcePath(sourceRoots[i].getResource().getProjectRelativePath());
- if (componentResources.length > 0) {
- IPath tmpRuntimePath = componentResources[0].getRuntimePath();
- IPath tmpSourcePath = componentResources[0].getSourcePath();
- if (!tmpRuntimePath.equals(tmpSourcePath)) {
- while (tmpSourcePath.segmentCount() > 0 && tmpRuntimePath.segmentCount() > 0 && tmpRuntimePath.lastSegment().equals(tmpSourcePath.lastSegment())) {
- tmpRuntimePath = tmpRuntimePath.removeLastSegments(1);
- tmpSourcePath = tmpSourcePath.removeLastSegments(1);
- }
- if (tmpRuntimePath.segmentCount() != 0) {
- runtimePath = tmpRuntimePath.makeRelative();
- }
- }
- }
- } catch (UnresolveableURIException e) {
- Logger.getLogger().logError(e);
- }
- if (null == runtimePath) {
- runtimePath = new Path(""); //$NON-NLS-1$
- }
-
- aggregateOutputFiles(new IResource[]{javaOutputFolder}, runtimePath, javaOutputFolder.getProjectRelativePath().segmentCount());
- }
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } finally {
- if (se != null) {
- se.dispose();
- }
- }
- }
-
- protected boolean aggregateOutputFiles(IResource[] resources, final IPath runtimePathPrefix, int outputFolderSegmentCount) throws CoreException {
- boolean fileAdded = false;
- for (int i = 0; i < resources.length; i++) {
- File cFile = null;
- if (!resources[i].exists()) {
- continue;
- }
- // We have to avoid duplicates between the source and output folders (non-java
- // resources)
- IPath runtimePath = runtimePathPrefix.append(resources[i].getProjectRelativePath().removeFirstSegments(outputFolderSegmentCount));
- String uri = runtimePath == null ? null : runtimePath.toString();
- if (uri == null)
- continue;
- if (resources[i].getType() == IResource.FILE) {
- if (!shouldInclude(uri))
- continue;
- cFile = createFile(uri);
- cFile.setLastModified(getLastModified(resources[i]));
- filesHolder.addFile(cFile, resources[i]);
- fileAdded = true;
- } else if (shouldInclude((IContainer) resources[i])) {
- IResource[] nestedResources = ((IContainer) resources[i]).members();
- if (!aggregateOutputFiles(nestedResources, runtimePathPrefix, outputFolderSegmentCount)) {
- if (!shouldInclude(uri))
- continue;
- cFile = createDirectory(uri);
- cFile.setLastModified(getLastModified(resources[i]));
- filesHolder.addDirectory(cFile);
- fileAdded = true;
- }
- }
- }
- return fileAdded;
- }
-
- protected boolean aggregateFiles(IVirtualResource[] virtualResources) throws CoreException {
- boolean fileAdded = false;
- for (int i = 0; i < virtualResources.length; i++) {
- File cFile = null;
- if (!virtualResources[i].exists()) {
- continue;
- }
- // We have to avoid duplicates between the source and output folders (non-java
- // resources)
- IPath runtimePath = virtualResources[i].getRuntimePath();
- String uri = runtimePath == null ? null : runtimePath.toString();
- if (uri == null)
- continue;
- if (uri.charAt(0) == IPath.SEPARATOR) {
- uri = uri.substring(1);
- }
- if (filesHolder.contains(uri))
- continue;
-
- if (virtualResources[i].getType() == IVirtualResource.FILE) {
- if (!shouldInclude(uri))
- continue;
- cFile = createFile(uri);
- IResource resource = virtualResources[i].getUnderlyingResource();
- cFile.setLastModified(getLastModified(resource));
- filesHolder.addFile(cFile, resource);
- fileAdded = true;
- } else if (shouldInclude((IVirtualContainer) virtualResources[i])) {
- IVirtualResource[] nestedVirtualResources = ((IVirtualContainer) virtualResources[i]).members();
- if (!aggregateFiles(nestedVirtualResources)) {
- if (!shouldInclude(uri))
- continue;
- cFile = createDirectory(uri);
- IResource resource = virtualResources[i].getUnderlyingResource();
- cFile.setLastModified(getLastModified(resource));
- filesHolder.addDirectory(cFile);
- fileAdded = true;
- }
- }
- }
- return fileAdded;
- }
-
- protected long getLastModified(IResource aResource) {
- return aResource.getLocation().toFile().lastModified();
- }
-
- public void setExportSource(boolean newExportSource) {
- exportSource = newExportSource;
- }
-
- public boolean isExportSource() {
- return exportSource;
- }
-
- protected boolean shouldInclude(IContainer aContainer) {
- return true;
- }
-
- protected boolean shouldInclude(IVirtualContainer vContainer) {
- return true;
- }
-
- protected boolean shouldInclude(String uri) {
- return isExportSource() || !isSource(uri);
- }
-
- protected boolean isSource(String uri) {
- if (uri == null)
- return false;
- return uri.endsWith(ArchiveUtil.DOT_JAVA) || uri.endsWith(ArchiveUtil.DOT_SQLJ);
- }
-
- protected void addExternalFile(String uri, java.io.File externalDiskFile) {
- File aFile = getArchiveFactory().createFile();
- aFile.setURI(uri);
- aFile.setOriginalURI(uri);
- aFile.setLoadingContainer(getContainer());
- filesHolder.addFile(aFile, externalDiskFile);
- }
-
- protected void addWorkspaceFile(String uri, IFile workspaceFile) {
- File aFile = getArchiveFactory().createFile();
- aFile.setURI(uri);
- aFile.setOriginalURI(uri);
- aFile.setLoadingContainer(getContainer());
- filesHolder.addFile(aFile, workspaceFile);
- }
-
- public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
- if (filesHolder.contains(uri)) {
- return filesHolder.getInputStream(uri);
- }
- IVirtualFolder rootFolder = vComponent.getRootFolder();
- IVirtualResource vResource = rootFolder.findMember(uri);
- String filePath = null;
- if (null != vResource && vResource.exists()) {
- filePath = vResource.getUnderlyingResource().getLocation().toOSString();
- java.io.File file = new java.io.File(filePath);
- return new FileInputStream(file);
- }
- String eString = EARArchiveOpsResourceHandler.ARCHIVE_OPERATION_FileNotFound;
- throw new FileNotFoundException(eString);
- }
-
- public Collection getLoadedMofResources() {
- Collection resources = super.getLoadedMofResources();
- Collection resourcesToRemove = new ArrayList();
- Iterator iterator = resources.iterator();
- while (iterator.hasNext()) {
- Resource res = (Resource) iterator.next();
- if (res.getURI().toString().endsWith(IModuleConstants.COMPONENT_FILE_NAME))
- resourcesToRemove.add(res);
- }
- if (null != resourcesToRemove) {
- resources.removeAll(resourcesToRemove);
- }
-
- return resources;
- }
-
- public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException {
- try {
- URI compUri = ModuleURIUtil.fullyQualifyURI(vComponent.getProject());
- IPath requestPath = new Path(compUri.path()).append(new Path(uri));
- URI resourceURI = URI.createURI(PlatformURLModuleConnection.MODULE_PROTOCOL + requestPath.toString());
- return getResourceSet().getResource(resourceURI, true);
- } catch (WrappedException wrapEx) {
- if ((ExtendedEcoreUtil.getFileNotFoundDetector().isFileNotFound(wrapEx))) {
- FileNotFoundException fileNotFoundEx = ExtendedEcoreUtil.getInnerFileNotFoundException(wrapEx);
- throw fileNotFoundEx;
- }
- throwResourceLoadException(uri, wrapEx);
- return null; // never happens - compiler expects it though
- }
-
- }
-
- public boolean isClassLoaderNeeded() {
- return false;
- }
-
- public IVirtualComponent getComponent() {
- return vComponent;
- }
-
- public void close() {
- Iterator it = zipFiles.iterator();
- while (it.hasNext()) {
- ZipFile file = (ZipFile) it.next();
- try {
- file.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
deleted file mode 100644
index 602fdde..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,173 +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.jst.j2ee.internal.archive.operations;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class ComponentSaveStrategyImpl extends SaveStrategyImpl {
-
- protected IDataModel dataModel;
- protected IVirtualComponent vComponent;
- protected IOverwriteHandler overwriteHandler;
- protected IProgressMonitor progressMonitor;
-
- public ComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super();
- if (null == vComponent) {
- throw new NullPointerException();
- }
- this.vComponent = vComponent;
- }
-
- public void setDataModel(IDataModel dataModel) {
- this.dataModel = dataModel;
- }
-
- public void setOverwriteHandler(IOverwriteHandler newOverwriteHandler) {
- overwriteHandler = newOverwriteHandler;
- }
-
- public void setProgressMonitor(IProgressMonitor newProgressMonitor) {
- progressMonitor = newProgressMonitor;
- }
-
- protected void validateEdit(IFile aFile) {
- if (overwriteHandler == null)
- return;
- if (!(aFile.exists() && aFile.isReadOnly()))
- return;
-
- overwriteHandler.validateEdit(aFile);
- }
-
- protected boolean shouldOverwrite(String uri) {
- if (overwriteHandler.isOverwriteNone())
- return false;
- return (overwriteHandler.isOverwriteResources() || overwriteHandler.isOverwriteAll() || overwriteHandler.shouldOverwrite(uri));
- }
-
- protected SaveStrategy createNestedSaveStrategy(Archive anArchive) throws IOException {
- return null;
- }
-
- protected OutputStream getOutputStreamForResource(Resource aResource) throws IOException {
- // this method has no references in the hirarchy
- return null;
- }
-
- public void save(File aFile, InputStream in) throws SaveFailureException {
- try {
- String displayString = EJBArchiveOpsResourceHandler.IMPORT_OPERATION_STRING;
- progressMonitor.subTask(displayString + aFile.getURI());
- IPath outputPath = getOutputPathForFile(aFile);
- if (!aFile.isDirectoryEntry()) {
- saveToOutputPath(outputPath, in);
- } else {
- createDirectory(outputPath);
- }
- } catch (OverwriteHandlerException ohe) {
- throw ohe;
- } catch (Exception e) {
- String errorString = EJBArchiveOpsResourceHandler.ARCHIVE_OPERATION_SaveFile + aFile.getName();
- throw new SaveFailureException(errorString, e);
- }
- }
-
- protected IPath getOutputPathForFile(File aFile) {
- return new Path(aFile.getURI().toString());
- }
-
- protected void saveToWorkbenchPath(IPath workbenchPath, InputStream in) throws Exception {
- IFile iFile = ResourcesPlugin.getWorkspace().getRoot().getFile(workbenchPath);
- // IFile iFile = vComponent.getProject().getFile(workbenchPath);
- saveToIFile(iFile, in);
- }
-
- protected void createDirectory(IPath outputPath) throws CoreException {
- IVirtualFolder rootFolder = vComponent.getRootFolder();
- IVirtualFolder vFolder = rootFolder.getFolder(outputPath);
- IFolder iFolder = (IFolder) vFolder.getUnderlyingFolder();
- if(!iFolder.exists()){
- mkdirs(iFolder);
- }
- }
-
- protected void mkdirs(IFolder folder) throws CoreException {
- IContainer container = folder.getParent();
- if (!container.exists()) {
- mkdirs((IFolder) container);
- }
- folder.create(true, true, null);
- }
-
- /**
- * Saves to the specified output path. The workbench path is computed from the output path.
- *
- * @param outputPath
- * @param in
- * @throws Exception
- */
- protected void saveToOutputPath(IPath outputPath, InputStream in) throws Exception {
- IVirtualFolder rootFolder = vComponent.getRootFolder();
- IVirtualFile vFile = rootFolder.getFile(outputPath);
- IFile iFile = vFile.getUnderlyingFile();
- saveToIFile(iFile, in);
- }
-
- protected void saveToIFile(IFile iFile, InputStream in) throws Exception {
- validateEdit(iFile);
- if (iFile.exists())
- iFile.setContents(in, true, true, null);
- else {
- mkdirs(iFile.getFullPath().removeLastSegments(1), ResourcesPlugin.getWorkspace().getRoot());
- iFile.create(in, true, null);
- }
- }
-
-
-
-
- protected void mkdirs(IPath path, IWorkspaceRoot root) throws CoreException {
- if (path.segmentCount() <= 1)
- return;
- IFolder folder = root.getFolder(path);
- if (!folder.exists()) {
- mkdirs(path.removeLastSegments(1), root);
- folder.create(true, true, null);
- }
- }
-
- public void save(ArchiveManifest aManifest) throws SaveFailureException {
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ConnectorComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ConnectorComponentSaveStrategyImpl.java
deleted file mode 100644
index f0c4e7a..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ConnectorComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ConnectorComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
- public ConnectorComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/DependentJarExportMerger.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/DependentJarExportMerger.java
deleted file mode 100644
index 6c5e888..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/DependentJarExportMerger.java
+++ /dev/null
@@ -1,129 +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.jst.j2ee.internal.archive.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.Attributes;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-
-public class DependentJarExportMerger {
- protected Archive outgoingArchive;
- protected IProject project;
- protected List dependentArchives;
- protected boolean includeSource;
-
- /**
- * DependentJarExportMerger constructor comment.
- */
- public DependentJarExportMerger(Archive archive, IProject aProject, boolean includeSourceFiles) {
- super();
- outgoingArchive = archive;
- project = aProject;
- includeSource = includeSourceFiles;
- }
-
- protected void finalize() throws Throwable {
- release();
- }
-
- public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- }
-
- public void merge() {
- String[] cp = outgoingArchive.getManifest().getClassPathTokenized();
- dependentArchives = new ArrayList(cp.length);
- List keepClassPaths = new ArrayList();
- for (int i = 0; i < cp.length; i++) {
- Archive dependentJar = null;
- IFile file = null;
- try {
- file = project.getFile(cp[i]);
- } catch (IllegalArgumentException e) {
- continue;
- }
- if (file.exists() && cp[i].endsWith(J2EEImportConstants.IMPORTED_JAR_SUFFIX)) {
- try {
- dependentJar = getArchiveFactory().primOpenArchive(file.getLocation().toOSString());
- } catch (OpenFailureException ex) {
- // Need to write this to the log file
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- continue;
- }
- dependentArchives.add(dependentJar);
- mergeFiles(dependentJar);
- } else
- keepClassPaths.add(cp[i]);
- }
- resetClassPath(keepClassPaths);
- }
-
- protected void mergeFiles(Archive dependentJar) {
- List files = dependentJar.getFiles();
- List filesToAdd = new java.util.ArrayList();
- for (int i = 0; i < files.size(); i++) {
- File aFile = (File) files.get(i);
- if (shouldMerge(aFile))
- filesToAdd.add(aFile);
- }
- try {
- outgoingArchive.addCopyFiles(filesToAdd);
- } catch (DuplicateObjectException ignore) {
- // Shouldn't happen because we just checked for dups
- }
- }
-
- /**
- * Clients must call this when done to close the archives
- */
- public void release() {
- if (dependentArchives == null)
- return;
- for (int i = 0; i < dependentArchives.size(); i++) {
- Archive anArchive = (Archive) dependentArchives.get(i);
- if (anArchive.isOpen())
- anArchive.close();
- }
- }
-
- protected void resetClassPath(List cp) {
- ArchiveManifest mf = outgoingArchive.getManifest();
- if (cp.isEmpty())
- mf.getMainAttributes().remove(Attributes.Name.CLASS_PATH);
- else {
- mf.setClassPath("");//$NON-NLS-1$
- for (int i = 0; i < cp.size(); i++) {
- mf.appendClassPath((String) cp.get(i));
- }
- }
- }
-
- protected boolean shouldMerge(File aFile) {
-
- String uri = aFile.getURI();
- if (!(uri.endsWith(".java") || uri.endsWith(".class")))//$NON-NLS-2$//$NON-NLS-1$
- return false;
- if (!includeSource && uri.endsWith(".java"))//$NON-NLS-1$
- return false;
- return !outgoingArchive.containsFile(uri) && !ArchiveConstants.MANIFEST_URI.equals(uri);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARArchiveOpsResourceHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARArchiveOpsResourceHandler.java
deleted file mode 100644
index 8dc663b..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARArchiveOpsResourceHandler.java
+++ /dev/null
@@ -1,47 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EARArchiveOpsResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "eararchiveops";//$NON-NLS-1$
-
- private EARArchiveOpsResourceHandler() {
- // Do not instantiate
- }
-
- public static String ARCHIVE_OPERATION_SaveMofResources;
- public static String ARCHIVE_OPERATION_SaveFile;
- public static String ARCHIVE_OPERATION_ProjectNature;
- public static String ARCHIVE_OPERATION_SaveManifest;
- public static String ARCHIVE_OPERATION_FileNotFound;
- public static String ARCHIVE_OPERATION_FileContents;
- public static String ARCHIVE_OPERATION_ErroOccured;
- public static String ARCHIVE_OPERATION_FilesFromProject;
- public static String ARCHIVE_OPERATION_OpeningArchive;
- public static String ARCHIVE_OPERATION_ImportOperation;
- public static String IMPORT_MOFRESOURCE_STRING;
- public static String EAR_IMPORT_FILE_STRING;
- public static String ERROR_IMPORTING_EAR_FILE;
- public static String ERROR_EXPORTING_EAR_FILE;
- public static String IMPORTING_EAR_FILE_UI_;
- public static String Updating_project_classpath_UI_;
- public static String UNABLE_TO_LOAD_MODULE_ERROR_;
- public static String _jar_UI_;
- public static String Updating_manifest_Class_Path__attributes_UI_;
- public static String _preDeploy_ERROR_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EARArchiveOpsResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentExportOperation.java
deleted file mode 100644
index df0a87c..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentExportOperation.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.internal.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EARComponentExportOperation extends J2EEArtifactExportOperation {
-
- public EARComponentExportOperation(IDataModel model) {
- super(model);
- }
-
- protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
- EARArtifactEdit artifactEdit = null;
- try {
- artifactEdit = (EARArtifactEdit) ComponentUtilities.getArtifactEditForRead(getComponent());
- EARFile archive = (EARFile) artifactEdit.asArchive(isExportSource());
- String destination = getDestinationPath().toOSString();
- archive.setURI(destination);
- setModuleFile(archive);
- archive.saveAsNoReopen(destination);
- } catch (SaveFailureException ex) {
- throw ex;
- } catch (Exception e) {
- throw new SaveFailureException(AppClientArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
- } finally {
- if (null != artifactEdit) {
- artifactEdit.dispose();
- }
- }
- }
-
- protected String archiveString() {
- return "EAR";
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
deleted file mode 100644
index 432a864..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
+++ /dev/null
@@ -1,197 +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.jst.j2ee.internal.archive.operations;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EARComponentImportOperation extends J2EEArtifactImportOperation {
-
- protected EARArtifactEdit artifactEdit = null;
-
- public EARComponentImportOperation(IDataModel model) {
- super(model);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Subclasses must override to performs the workbench modification steps that are to be
- * contained within a single logical workbench change.
- *
- * @param monitor
- * the progress monitor to use to display progress
- */
- protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
- super.doExecute(monitor);
- List modelsToImport = (List) model.getProperty(IEARComponentImportDataModelProperties.HANDLED_PROJECT_MODELS_LIST);
- try {
- IDataModel importModel = null;
- List allModels = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- List componentToAdd = new ArrayList();
- Map componentToURIMap = new HashMap();
- for (int i = 0; i < allModels.size(); i++) {
- importModel = (IDataModel) allModels.get(i);
- if (modelsToImport.contains(importModel)) {
- String archiveUri = ((Archive) importModel.getProperty(IEARComponentImportDataModelProperties.FILE)).getURI();
- importModel.setProperty(IJ2EEComponentImportDataModelProperties.CLOSE_ARCHIVE_ON_DISPOSE, Boolean.FALSE);
- IDataModel compCreationModel = importModel.getNestedModel("IJ2EEArtifactImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION");
- if (compCreationModel.isProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI))
- compCreationModel.setProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI, archiveUri);
- try {
- importModel.getDefaultOperation().execute(monitor, info);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- IVirtualComponent component = (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
- componentToAdd.add(component);
- componentToURIMap.put(component, archiveUri);
-
- }
- }
- if (componentToAdd.size() > 0) {
- IDataModel addComponentsDM = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- addComponentsDM.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, virtualComponent);
- addComponentsDM.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, componentToAdd);
- addComponentsDM.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
- addComponentsDM.getDefaultOperation().execute(monitor, info);
- }
- try {
- fixupClasspaths(modelsToImport, virtualComponent);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- } finally {
- if (null != artifactEdit) {
- artifactEdit.dispose();
- artifactEdit = null;
- }
- resetDisposeImportModels();
-
- // FileSet.printState();
- }
- }
-
- /**
- * @param modelsToImport
- */
- private void resetDisposeImportModels() {
- resetDisposeImportModels((List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST));
- }
-
- private void resetDisposeImportModels(List models) {
- IDataModel model;
- for (int i = 0; i < models.size(); i++) {
- model = (IDataModel) models.get(i);
- model.setProperty(IJ2EEComponentImportDataModelProperties.CLOSE_ARCHIVE_ON_DISPOSE, Boolean.TRUE);
- }
- }
-
-
- private void fixupClasspaths(List selectedModels, IVirtualComponent earComponent) throws JavaModelException {
- IDataModel importModel;
- for (int i = 0; i < selectedModels.size(); i++) {
- importModel = (IDataModel) selectedModels.get(i);
- Archive archive = (Archive) importModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- String[] manifestClasspath = archive.getManifest().getClassPathTokenized();
- if (manifestClasspath.length > 0) {
- if (null == artifactEdit) {
- artifactEdit = EARArtifactEdit.getEARArtifactEditForRead(earComponent.getProject());
- }
- List extraEntries = fixupClasspath(earComponent, manifestClasspath, new ArrayList(), archive, (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT));
- addToClasspath(importModel, extraEntries);
- fixModuleReference(importModel, manifestClasspath);
- }
- }
- }
-
- private List fixupClasspath(IVirtualComponent earComponent, String[] manifestClasspath, List computedFiles, Archive anArchive, IVirtualComponent nestedComponent) throws JavaModelException {
- List extraEntries = new ArrayList();
- for (int j = 0; j < manifestClasspath.length; j++) {
- String manifestURI = ArchiveUtil.deriveEARRelativeURI(manifestClasspath[j], anArchive);
- if (null == manifestURI) {
- continue;
- }
- IVirtualFile vFile = earComponent.getRootFolder().getFile(manifestURI);
- if (!computedFiles.contains(vFile)) {
- computedFiles.add(vFile);
- if (vFile.exists()) {
- IFile file = vFile.getUnderlyingFile();
- extraEntries.add(JavaCore.newLibraryEntry(file.getFullPath(), file.getFullPath(), null, true));
- Archive archive = null;
- try {
- archive = (Archive) getEarFile().getFile(manifestURI);
- String[] nestedManifestClasspath = archive.getManifest().getClassPathTokenized();
- extraEntries.addAll(fixupClasspath(earComponent, nestedManifestClasspath, computedFiles, archive, nestedComponent));
- } catch (FileNotFoundException e) {
- Logger.getLogger().logError(e);
- } finally {
- if (null != archive) {
- archive.close();
- }
- }
- } else {
- IVirtualComponent comp = artifactEdit.getModuleByManifestURI(manifestURI);
- if (null != comp) {
- IProject project = comp.getProject();
- extraEntries.add(JavaCore.newProjectEntry(project.getFullPath(), true));
- } else {
- String compSearchName = manifestURI.substring(0, manifestURI.length() - 4);
- IVirtualReference vRef = earComponent.getReference(compSearchName);
- if (null != vRef && nestedComponent.getProject() != vRef.getReferencedComponent().getProject()) {
- IProject project = vRef.getReferencedComponent().getProject();
- extraEntries.add(JavaCore.newProjectEntry(project.getFullPath(), true));
- }
- }
- }
- }
- }
- return extraEntries;
- }
-
- protected SaveStrategy createSaveStrategy(IProject project) { // NOOP
- return null;
- }
-
- protected SaveStrategy createSaveStrategy(IVirtualComponent virtualComponent) {
- return new EARComponentSaveStrategyImpl(virtualComponent);
- }
-
- protected EARFile getEarFile() {
- return (EARFile) model.getProperty(IEARComponentImportDataModelProperties.FILE);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
deleted file mode 100644
index 4f25d47..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,108 +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.jst.j2ee.internal.archive.operations;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class EARComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
- public EARComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
- public List getFiles() {
- aggregateSourceFiles();
- addModulesAndUtilities();
- return filesHolder.getFiles();
- }
-
- public void addModulesAndUtilities() {
- EARArtifactEdit earArtifactEdit = null;
- try {
- earArtifactEdit = EARArtifactEdit.getEARArtifactEditForRead(vComponent);
- IVirtualReference[] components = earArtifactEdit.getComponentReferences();
- for (int i = 0; i < components.length; i++) {
- IVirtualReference reference = components[i];
- IVirtualComponent referencedComponent = reference.getReferencedComponent();
- if( !referencedComponent.isBinary() ){
- if (J2EEProjectUtilities.isApplicationClientProject(referencedComponent.getProject()) || J2EEProjectUtilities.isEJBProject(referencedComponent.getProject()) || J2EEProjectUtilities.isDynamicWebProject(referencedComponent.getProject()) || J2EEProjectUtilities.isJCAProject(referencedComponent.getProject())) {
- ArtifactEdit componentArtifactEdit = null;
- try {
- componentArtifactEdit = ComponentUtilities.getArtifactEditForRead(referencedComponent);
- Archive archive = ((EnterpriseArtifactEdit) componentArtifactEdit).asArchive(exportSource);
- archive.setURI(earArtifactEdit.getModuleURI(referencedComponent));
- filesHolder.addFile(archive);
- } catch (OpenFailureException oe) {
- Logger.getLogger().logError(oe);
- } finally {
- if (componentArtifactEdit != null) {
- componentArtifactEdit.dispose();
- }
- }
- } else if (J2EEProjectUtilities.isUtilityProject(referencedComponent.getProject())) {
- try {
- if (!referencedComponent.isBinary()) {
- String uri = referencedComponent.getName() + ".jar"; //$NON-NLS-1$
- Archive archive = J2EEProjectUtilities.asArchive(uri, referencedComponent.getProject(), exportSource);
- filesHolder.addFile(archive);
- }
- } catch (OpenFailureException e) {
- Logger.getLogger().logError(e);
- }
- }
- }else{
- java.io.File diskFile = ((VirtualArchiveComponent) referencedComponent).getUnderlyingDiskFile();
- if (!diskFile.exists()) {
- IFile wbFile = ((VirtualArchiveComponent) referencedComponent).getUnderlyingWorkbenchFile();
- diskFile = new File(wbFile.getLocation().toOSString());
- }
- String uri = diskFile.getName();
- addExternalFile(uri, diskFile);
- }
- }
-
- } finally {
- if (null != earArtifactEdit) {
- earArtifactEdit.dispose();
- }
- }
- }
-
- public ZipFileLoadStrategyImpl createLoadStrategy(String uri) throws FileNotFoundException, IOException {
- String filename = uri.replace('/', java.io.File.separatorChar);
- java.io.File file = new java.io.File(filename);
- if (!file.exists()) {
- throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // = "URI Name: {0}; File name: {1}"
- }
- if (file.isDirectory()) {
- throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // = "URI Name: {0}; File name: {1}"
- }
- return new org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl(file);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentSaveStrategyImpl.java
deleted file mode 100644
index ad12f62..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,238 +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.jst.j2ee.internal.archive.operations;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EARComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
- protected Map createdComponentsMap;
-
- public EARComponentSaveStrategyImpl(IVirtualComponent component) {
- super(component);
- }
-
- public void setDataModel(IDataModel dataModel) {
- super.setDataModel(dataModel);
-
- setArchive((Archive) dataModel.getProperty(IEARComponentImportDataModelProperties.FILE));
- overwriteHandler = (IOverwriteHandler) dataModel.getProperty(IEARComponentImportDataModelProperties.OVERWRITE_HANDLER);
- if (null != overwriteHandler) {
- overwriteHandler.setEarSaveStrategy(this);
- }
- buildProjectsMap();
- }
-
-
-
- /**
- * Creates a Map mapping archive uris to projects for all archives in the ear that imported as
- * projects.
- */
- private void buildProjectsMap() {
- createdComponentsMap = new HashMap();
- List createdProjectsList = (List) dataModel.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- IDataModel importDM = null;
- Archive anArchive = null;
- for (int i = 0; i < createdProjectsList.size(); i++) {
- importDM = (IDataModel) createdProjectsList.get(i);
- anArchive = (Archive) importDM.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- createdComponentsMap.put(anArchive.getURI(), importDM.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT));
- }
- }
-
- protected void addFileToClasspath(IProject p, IFile file, List cp) {
- if (!file.exists())
- return;
-
- // Assume the file also contains the source
- IPath path = file.getFullPath();
- IClasspathEntry entry = JavaCore.newLibraryEntry(path, path, null, true);
- if (!cp.contains(entry))
- cp.add(entry);
- }
-
- protected void addProjectToClasspath(IProject dependent, IProject prereq, List cp) {
- IClasspathEntry entry = JavaCore.newProjectEntry(prereq.getFullPath(), true);
- if (!cp.contains(entry))
- cp.add(entry);
- }
-
- protected EARFile getEARFile() {
- return (EARFile) getArchive();
- }
-
-
- protected java.io.OutputStream getOutputStreamForResource(org.eclipse.emf.ecore.resource.Resource aResource) throws java.io.IOException {
- return null;
- }
-
- public void save() throws SaveFailureException {
-
- saveFiles();
- saveManifest();
- saveMofResources();
- progressMonitor.subTask(EARArchiveOpsResourceHandler.Updating_project_classpath_UI_);
- updateComponentClasspaths();
-
- }
-
- public void save(Archive anArchive) throws SaveFailureException {
- progressMonitor.subTask(anArchive.getURI());
- saveArchiveAsJARInEAR(anArchive);
- }
-
- protected void saveArchiveAsJARInEAR(Archive anArchive) throws SaveFailureException {
- try {
- anArchive.save(createNestedSaveStrategy(anArchive));
- progressMonitor.worked(1);
- } catch (IOException e) {
- throw new SaveFailureException(anArchive.getURI(), e);
- }
- }
-
- protected SubProgressMonitor subMonitor() {
- return new SubProgressMonitor(progressMonitor, 10);
- }
-
- public void setMonitor(org.eclipse.core.runtime.IProgressMonitor newMonitor) {
- progressMonitor = newMonitor;
- }
-
- protected boolean shouldSave(File aFile) {
- if (aFile.isArchive()) {
- if (operationHandlesNested((Archive) aFile)) {
- return false;
- }
- return getFilter().shouldSave(aFile.getURI(), getArchive());
- }
- return super.shouldSave(aFile);
- }
-
- protected boolean operationHandlesNested(Archive archive) {
- if (null != dataModel) {
- List list = (List) dataModel.getProperty(IEARComponentImportDataModelProperties.HANDLED_PROJECT_MODELS_LIST);
- for (int i = 0; i < list.size(); i++) {
- if (archive == ((IDataModel) list.get(i)).getProperty(IEARComponentImportDataModelProperties.FILE)) {
- return true;
- }
- }
- }
- return false;
- }
-
- protected boolean shouldSave(String uri) {
- if (overwriteHandler != null) {
- if (overwriteHandler.isOverwriteNone())
- return false;
- return ((super.shouldSave(uri)) && (overwriteHandler.isOverwriteAll() ||overwriteHandler.isOverwriteResources() || overwriteHandler.shouldOverwrite(uri)));
- }
- return true;
- }
-
-
- /*
- * Parse the manifest of the module file; for each cp entry 1) cananonicalize to a uri that
- * looks like the entry in the ear 2) If the ear contains a file with that uri (the entry is
- * valid) a) If the file is another was blown out to a project, add a cp entry for a referenced
- * project b) otherwise, add a cp entry that points to the file in the ear project, and cp
- * entries for all prereqs
- */
- protected void updateProjectClasspath(Archive anArchive, IVirtualComponent component) {
-
- String message = EARArchiveOpsResourceHandler.Updating_project_classpath_UI_ + component.getName();
- progressMonitor.subTask(message);
- List projectCpEntries = new ArrayList();
- Set visited = new HashSet();
- traverseClasspaths(component.getProject(), anArchive, projectCpEntries, visited);
-
- try {
- if (!projectCpEntries.isEmpty())
- JemProjectUtilities.appendJavaClassPath(component.getProject(), projectCpEntries);
- JemProjectUtilities.forceClasspathReload(component.getProject());
- } catch (JavaModelException ex) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- }
-
- }
-
- /*
- * If you have a dependency to a JAR in the EAR project, and the JAR depends on another JAR in
- * the EAR; you want to compile cleanly after import, so you need both those JARs on your build
- * path
- */
- protected void traverseClasspaths(IProject p, Archive anArchive, List projectCpEntries, Set visitedArchives) {
- visitedArchives.add(anArchive);
- String[] manifestCpEntries = anArchive.getManifest().getClassPathTokenized();
- EARFile earFile = (EARFile) dataModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- for (int i = 0; i < manifestCpEntries.length; i++) {
- String uri = ArchiveUtil.deriveEARRelativeURI(manifestCpEntries[i], anArchive);
- // ensure the entry is valid or skip to the next
- if (uri == null)
- continue;
- File aFile = null;
- try {
- aFile = earFile.getFile(uri);
- } catch (FileNotFoundException notThere) {
- }
- if (aFile == null || !aFile.isArchive() || visitedArchives.contains(aFile))
- continue;
- Archive depArchive = (Archive) aFile;
- IProject prereq = null;
- IVirtualComponent depComponent = (IVirtualComponent) createdComponentsMap.get(uri);
- if (depComponent != null)
- prereq = depComponent.getProject();
-
- if (prereq != null) {
- addProjectToClasspath(p, prereq, projectCpEntries);
- } else {
- addFileToClasspath(p, vComponent.getRootFolder().getFile(uri).getUnderlyingFile(), projectCpEntries);
- traverseClasspaths(p, depArchive, projectCpEntries, visitedArchives);
- }
- }
- }
-
- protected void updateComponentClasspaths() {
- List jarFiles = getEARFile().getArchiveFiles();
- for (int i = 0; i < jarFiles.size(); i++) {
- Archive anArchive = (Archive) jarFiles.get(i);
- IVirtualComponent component = (IVirtualComponent) createdComponentsMap.get(anArchive.getURI());
- if (component != null)
- updateProjectClasspath(anArchive, component);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBArchiveOpsResourceHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBArchiveOpsResourceHandler.java
deleted file mode 100644
index 8f0f800..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBArchiveOpsResourceHandler.java
+++ /dev/null
@@ -1,52 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EJBArchiveOpsResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "ejbarchiveops";//$NON-NLS-1$
-
- private EJBArchiveOpsResourceHandler() {
- // Do not instantiate
- }
-
- public static String ARCHIVE_OPERATION_SaveMofResources;
- public static String ARCHIVE_OPERATION_SaveFile;
- public static String ARCHIVE_OPERATION_ProjectNature;
- public static String ARCHIVE_OPERATION_SaveManifest;
- public static String ARCHIVE_OPERATION_FileNotFound;
- public static String ARCHIVE_OPERATION_FileContents;
- public static String ARCHIVE_OPERATION_ErroOccured;
- public static String ARCHIVE_OPERATION_FilesFromProject;
- public static String ARCHIVE_OPERATION_OpeningArchive;
- public static String ARCHIVE_OPERATION_InvalidEJBJar;
- public static String ARCHIVE_OPERATION_InvalidImportEJBJar;
- public static String ARCHIVE_OPERATION_ImportOperation;
- public static String EJB_IMPORT_OPERATION_STRING;
- public static String EJB_IMPORT_FILE_STRING;
- public static String IMPORT_MOFRESOURCE_STRING;
- public static String IMPORT_OPERATION_STRING;
- public static String ERROR_COPYING_FILES_FROM_ORIGINAL_JAR;
- public static String ERROR_IMPORTING_MODULE_FILE;
- public static String Yes_UI;
- public static String No_UI;
- public static String Yes_To_All_UI;
- public static String Cancel_UI_;
- public static String Error_exporting__UI_;
- public static String EJB_Jar_File_UI_;
- public static String Copy_Dep_JARS_UI;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBArchiveOpsResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBComponentSaveStrategyImpl.java
deleted file mode 100644
index 0b1b3a1..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
- public EJBComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IOverwriteHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IOverwriteHandler.java
deleted file mode 100644
index b47b26e..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IOverwriteHandler.java
+++ /dev/null
@@ -1,142 +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.jst.j2ee.internal.archive.operations;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-
-
-/**
- * Insert the type's description here. Creation date: (4/16/2001 3:12:41 PM)
- *
- * @author: Administrator
- */
-public interface IOverwriteHandler {
- public static final String NO = EJBArchiveOpsResourceHandler.No_UI;
- public static final String YES = EJBArchiveOpsResourceHandler.Yes_UI;
- public static final String ALL = EJBArchiveOpsResourceHandler.Yes_To_All_UI;
- public static final String NONE = EJBArchiveOpsResourceHandler.Cancel_UI_;
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- org.eclipse.core.resources.IProject getProject();
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- boolean isOverwriteAll();
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- boolean isOverwriteNone();
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- boolean isOverwriteResources();
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- String queryOverwrite(String resourcePath);
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- void setEarSaveStrategy(EARComponentSaveStrategyImpl newEarSaveStrategy);
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- void setEjbSaveStrategy(J2EEComponentSaveStrategyImpl newEjbSaveStrategy);
-
- /**
- * Sets the RAR SaveStrategy.
- *
- * @param RARProjectSaveStrategyImpl
- * rarSaveStrategy - The rar save strategy to set.
- */
- void setRARSaveStrategy(J2EEComponentSaveStrategyImpl newRARSaveStrategy);
-
- void setOverwriteAll(boolean newAllTrue);
-
- void setOverwriteNone(boolean newNoneTrue);
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- void setOverwriteResources(boolean newOverwriteResources);
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- void setProject(org.eclipse.core.resources.IProject newProject);
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- void setWarSaveStrategy(J2EEComponentSaveStrategyImpl newWarSaveStrategy);
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- boolean shouldOverwrite(String uri);
-
- /**
- * Check to see if the file can be checked out.
- *
- * @throws OverwriteHandlerException
- * if the validate fails
- */
- void validateEdit(IFile aFile) throws OverwriteHandlerException;
-
- /**
- * Check to see if the files can be checked out.
- *
- * @throws OverwriteHandlerException
- * if the validate fails
- */
- void validateState(ResourceStateValidator resourceStateValidator);
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
- *
- * @return boolean
- */
- boolean shouldOverwriteWLProject(IProject fProject, java.lang.String uri);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java
deleted file mode 100644
index d2a63eb..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java
+++ /dev/null
@@ -1,90 +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.jst.j2ee.internal.archive.operations;
-
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.IJ2EEProjectTypes;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * This class defines the rules for importing an individual nested JAR in an EAR project
- */
-public class ImportOption implements IJ2EEProjectTypes {
- /**
- * Project info for the individual module/JAR, or null if the file should be placed in the
- * application
- */
- protected IDataModel model;
-
- /**
- * Valid only if the project info is not null
- *
- * @see IJ2EEProjectTypes
- */
- protected int projectType = IJ2EEProjectTypes.DEFAULT;
-
- /**
- * @see IJ2EEProjectTypes#MODULE
- * @see IJ2EEProjectTypes#UTIL
- */
- protected int archiveType = IJ2EEProjectTypes.MODULE;
-
- /**
- * Constructor for ImportOption.
- */
- public ImportOption(IDataModel model) {
- super();
- this.model = model;
- }
-
- public ImportOption(IDataModel model, int type) {
- this(model);
- projectType = type;
- }
-
- public IDataModel getModel() {
- return model;
- }
-
- public int getProjectType() {
- return projectType;
- }
-
- public String getProjectName() {
- return model.getStringProperty(IJ2EEComponentCreationDataModelProperties.PROJECT_NAME);
- }
-
- /**
- * @return Returns the archiveType.
- */
- public int getArchiveType() {
- return archiveType;
- }
-
- /**
- * @param archiveType
- * The archiveType to set.
- */
- public void setArchiveType(int archiveType) {
- this.archiveType = archiveType;
- }
-
- /**
- * @param projectType
- * The projectType to set.
- */
- public void setProjectType(int projectType) {
- this.projectType = projectType;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java
deleted file mode 100644
index 68493d1..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java
+++ /dev/null
@@ -1,205 +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.jst.j2ee.internal.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceRuleFactory;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class J2EEArtifactExportOperation extends AbstractDataModelOperation {
-
- protected IProgressMonitor progressMonitor;
- private IVirtualComponent component;
- private IPath destinationPath;
- private ModuleFile moduleFile;
- private boolean exportSource = false;
-
- public J2EEArtifactExportOperation() {
- super();
- }
-
- public J2EEArtifactExportOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- setComponent((IVirtualComponent) model.getProperty(IJ2EEComponentExportDataModelProperties.COMPONENT));
- setDestinationPath(new Path(model.getStringProperty(IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION)));
- setExportSource(model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES));
- try {
- setProgressMonitor(monitor);
- // defect 240999
- component.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
- if (model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.RUN_BUILD)) {
- runNecessaryBuilders(component, monitor);
- }
- export();
- } catch (Exception e) {
- throw new ExecutionException(EJBArchiveOpsResourceHandler.Error_exporting__UI_ + archiveString(), e);
- }
- return OK_STATUS;
- }
-
- protected abstract void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException;
-
- protected abstract String archiveString();
-
- protected void setProgressMonitor(IProgressMonitor newProgressMonitor) {
- progressMonitor = newProgressMonitor;
- }
-
- protected IProgressMonitor getProgressMonitor() {
- return progressMonitor;
- }
-
- private void setComponent(IVirtualComponent newComponent) {
- component = newComponent;
- }
-
- protected IVirtualComponent getComponent() {
- if (component == null)
- component = (IVirtualComponent) model.getProperty(IJ2EEComponentExportDataModelProperties.COMPONENT);
- return component;
- }
-
- protected IPath getDestinationPath() {
- return destinationPath;
- }
-
- protected void setDestinationPath(IPath newDestinationPath) {
- destinationPath = newDestinationPath;
- }
-
- protected boolean isExportSource() {
- return exportSource;
- }
-
- protected void setExportSource(boolean newExportSource) {
- exportSource = newExportSource;
- }
-
- protected ModuleFile getModuleFile() {
- return moduleFile;
- }
-
- protected void setModuleFile(ModuleFile newModuleFile) {
- moduleFile = newModuleFile;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- protected void runNecessaryBuilders(IVirtualComponent component, IProgressMonitor monitor) throws CoreException {
- IProject project = component.getProject();
- IProjectDescription description = project.getDescription();
- ICommand javaBuilder = getJavaCommand(description);
- if (javaBuilder != null) {
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, JavaCore.BUILDER_ID, javaBuilder.getArguments(), monitor);
- }
- ICommand libCopyBuilder = getLibCopyBuilder(description);
- if (null != libCopyBuilder) {
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, LibCopyBuilder.BUILDER_ID, libCopyBuilder.getArguments(), monitor);
- }
- }
-
- /**
- * Find the specific Java command amongst the build spec of a given description
- */
- protected ICommand getJavaCommand(IProjectDescription description) throws CoreException {
- if (description == null) {
- return null;
- }
-
- ICommand[] commands = description.getBuildSpec();
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(JavaCore.BUILDER_ID)) {
- return commands[i];
- }
- }
- return null;
- }
-
- protected ICommand getLibCopyBuilder(IProjectDescription description) throws CoreException {
- if (description == null) {
- return null;
- }
-
- ICommand[] commands = description.getBuildSpec();
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(LibCopyBuilder.BUILDER_ID)) {
- return commands[i];
- }
- }
- return null;
-
- }
-
- public ISchedulingRule getSchedulingRule() {
- Set projs = gatherDependentProjects(getComponent(), new HashSet());
- ISchedulingRule combinedRule = null;
- IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace().getRuleFactory();
- for (Iterator iter = projs.iterator(); iter.hasNext();) {
- IProject proj = (IProject) iter.next();
- ISchedulingRule rule = ruleFactory.createRule(proj);
- combinedRule = MultiRule.combine(rule, combinedRule);
- }
- combinedRule = MultiRule.combine(ruleFactory.buildRule(), combinedRule);
-
- return combinedRule;
- }
-
- private Set gatherDependentProjects(IVirtualComponent comp, Set projs) {
- if (!projs.contains(comp.getProject())) {
- projs.add(comp.getProject());
- IVirtualReference[] refs = comp.getReferences();
- for (int i = 0; i < refs.length; i++) {
- IVirtualReference refComp = refs[i];
- projs.addAll(gatherDependentProjects(refComp.getReferencedComponent(), projs));
- }
- }
- return projs;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java
deleted file mode 100644
index bd71ed0..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java
+++ /dev/null
@@ -1,188 +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.jst.j2ee.internal.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-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.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsOp;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-
-public abstract class J2EEArtifactImportOperation extends AbstractDataModelOperation {
-
- protected ModuleFile moduleFile;
- protected IVirtualComponent virtualComponent;
- protected IAdaptable info;
-
- public J2EEArtifactImportOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable anInfo) throws ExecutionException {
- try {
- this.info = anInfo;
- doExecute(monitor);
- return OK_STATUS;
- } finally {
- model.dispose();
- }
- }
-
- protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
- moduleFile = (ModuleFile) model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- monitor.beginTask(null, moduleFile.getFiles().size());
-
- virtualComponent = createVirtualComponent(model.getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION), monitor);
-
- try {
- importModuleFile(monitor);
- } catch (InvocationTargetException e) {
- throw new ExecutionException(e.getMessage(), e);
- } catch (InterruptedException e) {
- throw new ExecutionException(e.getMessage(), e);
- }
- }
-
- protected IVirtualComponent createVirtualComponent(IDataModel aModel, IProgressMonitor monitor) throws ExecutionException {
- aModel.getDefaultOperation().execute(monitor, info);
- return (IVirtualComponent) aModel.getProperty(IComponentCreationDataModelProperties.COMPONENT);
- }
-
- /**
- * Creates the appropriate save strategy. Subclases should overwrite this method to create the
- * appropriate save startegy for the kind of J2EE module project to import the archive
- */
- protected abstract SaveStrategy createSaveStrategy(IVirtualComponent vc);
-
- protected void modifyStrategy(SaveStrategy saveStrat) {
- }
-
- /**
- * perform the archive import operation
- *
- * @throws java.lang.reflect.InvocationTargetException
- * @throws java.lang.InterruptedException
- */
- protected void importModuleFile(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- try {
- monitor.worked(1);
- J2EEComponentSaveStrategyImpl aStrategy = (J2EEComponentSaveStrategyImpl) createSaveStrategy(virtualComponent);
- aStrategy.setProgressMonitor(monitor);
- aStrategy.setOverwriteHandler((IOverwriteHandler) model.getProperty(IJ2EEComponentImportDataModelProperties.OVERWRITE_HANDLER));
- aStrategy.setDataModel(model);
- modifyStrategy(aStrategy);
- moduleFile.save(aStrategy);
- } catch (OverwriteHandlerException oe) {
- throw new InterruptedException();
- } catch (Exception ex) {
- throw new WFTWrappedException(ex, EJBArchiveOpsResourceHandler.ERROR_IMPORTING_MODULE_FILE);
- }
- }
-
- protected static void addToClasspath(IDataModel importModel, List extraEntries) throws JavaModelException {
- if (extraEntries.size() > 0) {
- IJavaProject javaProject = JavaCore.create(((IVirtualComponent)importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT)).getProject());
- //IVirtualComponent comp = (IVirtualComponent)importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
- IClasspathEntry[] javaClasspath = javaProject.getRawClasspath();
- List nonDuplicateList = new ArrayList();
- for (int i = 0; i < extraEntries.size(); i++) {
- IClasspathEntry extraEntry = (IClasspathEntry) extraEntries.get(i);
- boolean include = true;
- for (int j = 0; include && j < javaClasspath.length; j++) {
- if (extraEntry.equals(javaClasspath[j])) {
- include = false;
- }
- }
- if (include) {
- nonDuplicateList.add(extraEntry);
- }
- }
- if (nonDuplicateList.size() > 0) {
- IClasspathEntry[] newJavaClasspath = new IClasspathEntry[javaClasspath.length + nonDuplicateList.size()];
- System.arraycopy(javaClasspath, 0, newJavaClasspath, 0, javaClasspath.length);
- for (int j = 0; j < nonDuplicateList.size(); j++) {
- newJavaClasspath[javaClasspath.length + j] = (IClasspathEntry) nonDuplicateList.get(j);
- }
- javaProject.setRawClasspath(newJavaClasspath, new NullProgressMonitor());
- }
- }
- }
-
- //Assumes that the project exists with the same name as the
- //entry in the manifest.
-
- protected void fixModuleReference(IDataModel importModel, String[] manifestEntries){
- IVirtualComponent comp = (IVirtualComponent)importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
-
- if ( J2EEProjectUtilities.isEJBProject(comp.getProject()) && manifestEntries.length > 0){
- for (int j = 0; j < manifestEntries.length; j++) {
- String name = manifestEntries[j];
- int endIndex = name.length() - 4; //lop off .jar
- if (endIndex < 1) {
- continue;
- }
- name = name.substring(0, endIndex);
- IProject project = null;
- try {
- project = ProjectUtilities.getProject(name);
- } catch (IllegalArgumentException e) {
- continue;
- }
- if( project != null && project.isAccessible() && project.exists()){
- IVirtualComponent refcomp = ComponentCore.createComponent(project);
- if( refcomp.exists()){
- ArrayList list = new ArrayList();
- list.add(refcomp);
- CreateReferenceComponentsOp op = ComponentUtilities.createReferenceComponentOperation(comp, list);
- try {
- op.execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
- }
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable adaptableInfo) throws ExecutionException {
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable adaptableInfo) throws ExecutionException {
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentLoadStrategyImpl.java
deleted file mode 100644
index 085563c..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class J2EEComponentLoadStrategyImpl extends ComponentLoadStrategyImpl{
-
- public J2EEComponentLoadStrategyImpl(IVirtualComponent component) {
- super(component);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentSaveStrategyImpl.java
deleted file mode 100644
index 8ea77e9..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,203 +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.jst.j2ee.internal.archive.operations;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-public abstract class J2EEComponentSaveStrategyImpl extends ComponentSaveStrategyImpl {
-
- public J2EEComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
- protected void saveFiles() throws SaveFailureException {
- setImportedClassFilesIfNecessary();
- super.saveFiles();
- linkImportedClassesFolderIfNecessary();
- }
-
- public boolean endsWithClassType(String aFileName) {
- if (aFileName.endsWith(".class")) //$NON-NLS-1$
- return true;
- return false;
- }
-
-
- protected boolean shouldSave(File aFile) {
- String uri = aFile.getURI();
- if (endsWithClassType(uri))
- return false;
- return super.shouldSave(aFile);
- }
-
- public void save(ArchiveManifest aManifest) throws SaveFailureException {
- IVirtualFolder rootFolder = vComponent.getRootFolder();
- IVirtualFile vFile = rootFolder.getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile iFile = vFile.getUnderlyingFile();
- validateEdit(iFile);
- OutputStream out = new WorkbenchByteArrayOutputStream(iFile);
- try {
- aManifest.write(out);
- } catch (IOException e) {
- Logger.getLogger().logError(e);
- } finally {
- try {
- out.close();
- } catch (IOException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- protected Map importedClassFiles;
- protected IFolder importedClassesFolder;
-
- protected void linkImportedClassesFolderIfNecessary() {
- if (importedClassesFolder != null) {
- try {
- vComponent.getRootFolder().getFolder(getImportedClassesRuntimePath()).createLink(importedClassesFolder.getProjectRelativePath(), 0, null);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- /**
- * Import class files into the project.
- */
- protected void setImportedClassFilesIfNecessary() throws SaveFailureException {
- Map classFiles = getClassFilesWithoutSource();
-
- if (classFiles == null || classFiles.isEmpty())
- return;
-
- importedClassFiles = classFiles;
-
- IContainer jarParent = vComponent.getRootFolder().getUnderlyingFolder().getParent();
- String folderName = "ImportedClasses";
- importedClassesFolder = jarParent.getFolder(new Path(folderName));
- try {
- importedClassesFolder.create(true, true, null);
-
- } catch (CoreException e1) {
- Logger.getLogger().logError(e1);
- }
- IJavaProject javaProject = null;
- try {
- Iterator keys = importedClassFiles.keySet().iterator();
- String uri = null;
- File file = null;
- IFile iFile = null;
- InputStream inputStream = null;
- while (keys.hasNext()) {
- uri = (String) keys.next();
- file = (File) importedClassFiles.get(uri);
- try {
- iFile = importedClassesFolder.getFile(new Path(uri));
- inputStream = file.getInputStream();
- saveToIFile(iFile, inputStream);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
- importedClassesFolder.refreshLocal(IResource.DEPTH_INFINITE, null);
- if (shouldAddImportedClassesToClasspath()) {
- if (JemProjectUtilities.getJavaProject(vComponent.getProject()) != null) {
- javaProject = JavaCore.create(vComponent.getProject());
- IClasspathEntry[] javaClasspath = javaProject.getRawClasspath();
- IClasspathEntry[] newJavaClasspath = new IClasspathEntry[javaClasspath.length + 1];
- System.arraycopy(javaClasspath, 0, newJavaClasspath, 0, javaClasspath.length);
- newJavaClasspath[newJavaClasspath.length - 1] = JavaCore.newLibraryEntry(importedClassesFolder.getFullPath(), null, null, true);
- javaProject.setRawClasspath(newJavaClasspath, new NullProgressMonitor());
- }
- }
- } catch (IOException e) {
- Logger.getLogger().logError(e);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } finally {
- try {
- if (javaProject != null)
- javaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- }
- }
- }
-
- protected boolean shouldAddImportedClassesToClasspath() {
- return true;
- }
-
- protected IPath getImportedClassesRuntimePath() {
- return new Path("/");
- }
-
- protected Map getClassFilesWithoutSource() {
- List files = archive.getFiles();
- Map result = new HashMap();
- for (int i = 0; i < files.size(); i++) {
- File aFile = (File) files.get(i);
- if (isClassWithoutSource(aFile)) {
- result.put(getImportedClassesURI(aFile), aFile);
- }
- }
- return result;
- }
-
- protected String getImportedClassesURI(File aFile) {
- return aFile.getURI();
- }
-
-
- protected boolean isClassWithoutSource(File aFile) {
- String javaUri = ArchiveUtil.classUriToJavaUri(aFile.getURI());
- if (javaUri == null)
- return false;
- return !archive.containsFile(javaUri);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEImportConstants.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEImportConstants.java
deleted file mode 100644
index 9bf8af5..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEImportConstants.java
+++ /dev/null
@@ -1,27 +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
- *******************************************************************************/
-/*
- * Created on Dec 18, 2003
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.archive.operations;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEImportConstants {
- public static final String IMPORTED_JAR_SUFFIX = ".imported_classes.jar"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEJavaComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEJavaComponentSaveStrategyImpl.java
deleted file mode 100644
index c7a0496..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEJavaComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class J2EEJavaComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
- public J2EEJavaComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentCreationDataModelProvider.java
deleted file mode 100644
index 1ed412e..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,147 +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.jst.j2ee.internal.archive.operations;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFlexibleProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.ComponentCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-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;
-
-public class JavaComponentCreationDataModelProvider extends ComponentCreationDataModelProvider implements IJavaComponentCreationDataModelProperties {
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(JAVASOURCE_FOLDER);
- propertyNames.add(MANIFEST_FOLDER);
- propertyNames.add(RUNTIME_TARGET_ID);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(JAVASOURCE_FOLDER)) {
- return getComponentName();
- } else if (propertyName.equals(MANIFEST_FOLDER)) {
- return "/" + J2EEConstants.META_INF; //$NON-NLS-1$
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public void init() {
- super.init();
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean status = super.propertySet(propertyName, propertyValue);
- if (PROJECT_NAME.equals(propertyName)) {
- // model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALUE_CHG);
- // IDataModel dm = (IDataModel)model.getNestedModel(NESTED_PROJECT_CREATION_DM);
- // dm.setProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_NAME,
- // propertyValue);
- } else if (LOCATION.equals(propertyName)) {
- IDataModel dm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
- dm.setProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_LOCATION, propertyValue);
- } else if (RUNTIME_TARGET_ID.equals(propertyName)) {
- IDataModel dm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
- dm.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID, propertyValue);
- }
-// else if (propertyName.equals(JAVASOURCE_FOLDER)){
-// //unless MANIFEST folder is opened up, it is set as same as Java source folder
-// setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF);
-// }
- return status;
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(JAVASOURCE_FOLDER)) {
- IStatus status = OK_STATUS;
- String srcFolderName = model.getStringProperty(JAVASOURCE_FOLDER);
- if (srcFolderName == null || srcFolderName.length() == 0) {
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SOURCEFOLDER_EMPTY);
- status = WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- return status;
-
- } else if (propertyName.equals(MANIFEST_FOLDER)) {
- IStatus status = OK_STATUS;
- String srcFolderName = model.getStringProperty(MANIFEST_FOLDER);
- if (srcFolderName == null || srcFolderName.length() == 0) {
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_NAME_EMPTY);
- status = WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- return status;
- } else if (propertyName.equals(RUNTIME_TARGET_ID)) {
-
- IDataModel dm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
- IStatus nestedValiation = dm.validate();
- if (!nestedValiation.isOK())
- return nestedValiation;
- }
- // else if(propertyName.equals(PROJECT_NAME)){
- // IDataModel projectdm = (IDataModel)model.getNestedModel(NESTED_PROJECT_CREATION_DM);
- // return
- // projectdm.validateProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_NAME);
- // }
-
- return super.validate(propertyName);
- }
-
- public JavaComponentCreationDataModelProvider() {
- super();
- }
-
- protected EClass getComponentType() {
- return CommonarchivePackage.eINSTANCE.getModuleFile();
- }
-
- protected Integer getDefaultComponentVersion() {
- Integer version = new Integer("10");
- return version;
- }
-
- protected String getComponentExtension() {
- return ".jar"; //$NON-NLS-1$
- }
-
- protected List getProperties() {
- return null;
- }
-
- protected void initProjectCreationModel() {
- IDataModel dm = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
- model.addNestedModel(NESTED_PROJECT_CREATION_DM, dm);
- model.setProperty(LOCATION, dm.getProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_LOCATION));
-
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (propertyName.equals(RUNTIME_TARGET_ID)) {
- // IDataModel projectdm = (IDataModel)model.getNestedModel(NESTED_PROJECT_CREATION_DM);
- // return
- // projectdm.getValidPropertyDescriptors(IFlexibleJavaProjectCreationDataModelProperties.SERVER_TARGET_ID);
- }
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentLoadStrategyImpl.java
deleted file mode 100644
index 3ffab1e..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
- public JavaComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentSaveStrategyImpl.java
deleted file mode 100644
index 2269718..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaComponentSaveStrategyImpl extends ComponentSaveStrategyImpl {
-
- public JavaComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/OverwriteHandlerException.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/OverwriteHandlerException.java
deleted file mode 100644
index 9ab5d92..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/OverwriteHandlerException.java
+++ /dev/null
@@ -1,42 +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.jst.j2ee.internal.archive.operations;
-
-
-
-/**
- * Insert the type's description here. Creation date: (8/16/2001 6:07:35 PM)
- *
- * @author: Administrator
- */
-public class OverwriteHandlerException extends RuntimeException {
- /**
- * Warning clean-up 12/05/2005
- */
- private static final long serialVersionUID = 1651836694391641930L;
-
- /**
- * OverwriteHandlerException constructor comment.
- */
- public OverwriteHandlerException() {
- super();
- }
-
- /**
- * OverwriteHandlerException constructor comment.
- *
- * @param s
- * java.lang.String
- */
- public OverwriteHandlerException(String s) {
- super(s);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/build.properties b/plugins/org.eclipse.jst.j2ee/build.properties
deleted file mode 100644
index 72330db..0000000
--- a/plugins/org.eclipse.jst.j2ee/build.properties
+++ /dev/null
@@ -1,34 +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
-###############################################################################
-bin.includes = schema/,\
- icons/,\
- dtds/,\
- plugin.properties,\
- prepareAllPII.xml,\
- plugin.xml,\
- .,\
- META-INF/,\
- about.html
-source.. = j2eeplugin/,\
- common/,\
- commonedit/,\
- earproject/,\
- j2eecreation/,\
- archiveops/,\
- applicationedit/,\
- appclientcreation/,\
- property_files/,\
- refactor/
-jars.compile.order = .
-src.includes = rose/,\
- schema,\
- component.xml
-output.. = bin/
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java
deleted file mode 100644
index 4e3fa5e..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java
+++ /dev/null
@@ -1,361 +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.jst.j2ee.internal.common;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.util.NotificationUtil;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-/**
- * This adapter is used to listen for changes to the ejb class or the primary key class in order to
- * reflect the proper CMP field types and the proper key attributes.
- */
-public class CMPJavaChangeSynchronizationAdapter extends AdapterImpl {
-
- private static final String J2EE_PROJ_MIGRATION_ADAPTER = "J2EEProjectMigration"; //$NON-NLS-1$
-
- protected static EjbPackage EJB_PACK = EjbFactoryImpl.getPackage();
-
- private static HashMap enablementMap = new HashMap();
-
- public static void disable(ContainerManagedEntity cmp) {
- enablementMap.put(cmp, Boolean.FALSE);
- }
-
- public static void enable(ContainerManagedEntity cmp) {
- enablementMap.put(cmp, Boolean.TRUE);
- }
-
- public static boolean isEnabled(ContainerManagedEntity cmp) {
- if (!enablementMap.containsKey(cmp))
- return true;
- return ((Boolean) enablementMap.get(cmp)).booleanValue();
- }
-
- protected Resource cmpResource;
-
- private List foundKeys = new ArrayList();
-
- public CMPJavaChangeSynchronizationAdapter() {
- super();
- } // EJBKeyShapeMaintenanceAdapter
-
- /**
- * Notifies if there is change in the key shape.
- *
- * @param Notification
- * msg - Message indicates what has changed.
- */
- public void notifyChanged(Notification msg) {
- if (!isEnabled(getCMP())) {
- enable(getCMP());
- return;
- }
- switch (msg.getEventType()) {
- case Notification.SET :
- setNotification(msg);
- break;
- case Notification.UNSET :
- unsetNotification(msg);
- break;
- // case Notification.TOUCH :
- // touchNotification(msg);
- // break;
- case Notification.REMOVING_ADAPTER :
- removeAdapterNotification(msg);
- break;
- } // switch
- } // notifyChanged
-
- /**
- * Use if the there was an set notification.
- *
- * @param Notification
- * msg - Message indicates what has changed.
- */
- protected void setNotification(Notification msg) {
- EStructuralFeature sf = (EStructuralFeature) msg.getFeature();
- if (sf == EJB_PACK.getEnterpriseBean_EjbClass() || sf == EJB_PACK.getEntity_PrimaryKey()) {
- if (!isMigrating()) {
- removeAttributeMaintenanceAdapter((Notifier) msg.getOldValue());
- addAttributeMaintenanceAdapter((Notifier) msg.getNewValue());
- touchKeyShapeAdapter(msg);
- }
- } else if (sf == EJB_PACK.getEntity_PrimaryKey()) {
- removeAttributeMaintenanceAdapter((Notifier) msg.getOldValue());
- if (shouldAddToPrimaryKeyClass((ContainerManagedEntity) getTarget()))
- addAttributeMaintenanceAdapter((Notifier) msg.getNewValue());
- } else {
- touchNotification(msg); //In EMF a TOUCH is a SET.
- }
- } // setNotification
-
- /**
- * @return
- */
- private boolean isMigrating() {
- EJBJar jar = ((ContainerManagedEntity) getTarget()).getEjbJar();
- if (jar != null)
- return EcoreUtil.getExistingAdapter(jar, J2EE_PROJ_MIGRATION_ADAPTER) != null;
- return false;
- }
-
- // setNotification
- /**
- * Use if the there was an unset notification.
- *
- * @param Notification
- * msg - Message indicates what has changed.
- */
- protected void unsetNotification(Notification msg) {
- EStructuralFeature sf = (EStructuralFeature) msg.getFeature();
- if ((sf == EJB_PACK.getEnterpriseBean_EjbClass() || sf == EJB_PACK.getEntity_PrimaryKey()) && !isMigrating()) {
- removeAttributeMaintenanceAdapter((Notifier) msg.getOldValue());
- }
- } // unsetNotification
-
- /**
- * Use if the there was an touch notification.
- *
- * @param Notification
- * msg - Message indicates what has changed.
- */
- protected void touchNotification(Notification msg) {
- if ((NotificationUtil.isFlushNewEvent(msg) || NotificationUtil.isFlushEvent(msg)) && !isMigrating()) {
- if (msg.getNotifier() == ((ContainerManagedEntity) getTarget()).getEjbClass()) {
- touchBeanAdapter(msg);
- } else if (msg.getNotifier() == ((ContainerManagedEntity) getTarget()).getPrimaryKey()) {
- touchKeyShapeAdapter(msg);
- } // if
- //if the notifier is eq the primary key
- //else ejb bean class flush
- } // if
- } // touchNotification
-
- protected void removeAdapterNotification(Notification msg) {
- if (msg.getOldValue() == this && msg.getNotifier() instanceof ContainerManagedEntity) {
- ContainerManagedEntity cmp = (ContainerManagedEntity) msg.getNotifier();
- if (cmp.getEjbClass() != null)
- cmp.getEjbClass().eAdapters().remove(this);
- if (cmp.getPrimaryKey() != null)
- cmp.getPrimaryKey().eAdapters().remove(this);
- }
- }
-
- /**
- * Adds the key shape adapter
- *
- * @param Notifier
- * notifier - The current notifier.
- */
- protected void addAttributeMaintenanceAdapter(Notifier notifier) {
- if (notifier != null && !notifier.eAdapters().contains(this))
- notifier.eAdapters().add(this);
- }
-
- /**
- * Remove the key shape adapter
- */
- protected void removeAttributeMaintenanceAdapter(Notifier notifier) {
- if (notifier != null)
- notifier.eAdapters().remove(this);
- }
-
- /**
- * The key has been touched.
- *
- * @param Notification
- * msg - The notification message.
- */
- protected void touchKeyShapeAdapter(Notification msg) {
- if (msg == null)
- return;
- ContainerManagedEntity cmp = (ContainerManagedEntity) getTarget();
- JavaClass primaryKeyClass = cmp.getPrimaryKey();
- //Synch the two lists.
- synchCMPandKeyAttributes(cmp, primaryKeyClass);
- } // touchKeyShapeAdapter
-
- /**
- * The ejb class has been flushed.
- *
- * @param Notification
- * msg - The notification message.
- */
- protected void touchBeanAdapter(Notification msg) {
- if (msg == null)
- return;
- ContainerManagedEntity cmp = (ContainerManagedEntity) getTarget();
- List cmpAttributes = cmp.getPersistentAttributes();
- if (cmpAttributes != null || !cmpAttributes.isEmpty()) {
- boolean modFlag = getCurrentModificationFlag();
- try {
- for (int i = 0; i < cmpAttributes.size(); i++) {
- CMPAttribute cmpAttr = (CMPAttribute) cmpAttributes.get(i);
- if (cmpAttr != null && !cmpAttr.isDerived()) {
- cmpAttr.setEType(null);
- }
- }
- } finally {
- setModificationFlag(modFlag);
- }
- }
- synchCMPandKeyAttributes(cmp, cmp.getPrimaryKey());
- }
-
- /**
- * Synchronzies the cmp and primary key class attributes.
- *
- * @param ContainerManagedEntity
- * cmp - The cmp.
- * @param JavaClass
- * primaryKeyClass
- */
- protected void synchCMPandKeyAttributes(ContainerManagedEntity cmp, JavaClass primaryKeyClass) {
- if (cmp == null || primaryKeyClass == null || cmp.getPrimKeyField() != null || primaryKeyClass.getQualifiedName().startsWith("java.lang")) //$NON-NLS-1$
- return;
-
- // make sure we flush the primary key to get latest updates if no save
- // took place
- flushPrimaryKeyClass(primaryKeyClass);
-
- List cmpAttributes = cmp.getPersistentAttributes();
- if (cmpAttributes != null || !cmpAttributes.isEmpty()) {
- foundKeys.clear();
- List keyAttributesList = cmp.getKeyAttributes();
- foundKeys.addAll(keyAttributesList);
- boolean modFlag = getCurrentModificationFlag();
- try {
- List keyFields = primaryKeyClass.getFieldsExtended();
- for (int i = 0; i < keyFields.size(); i++) {
- Field field = (Field) keyFields.get(i);
- if (field.getJavaVisibility() != JavaVisibilityKind.PUBLIC_LITERAL)
- continue;
- String fieldName = field.getName();
- if (fieldName != null) {
- CMPAttribute keyAttr = cmp.getKeyAttribute(fieldName);
- if (keyAttr == null)
- cmp.addKeyAttributeName(fieldName);
- else
- foundKeys.remove(keyAttr);
- }
- }
- if (!foundKeys.isEmpty())
- keyAttributesList.removeAll(foundKeys);
- } finally {
- setModificationFlag(modFlag);
- }
- }
- }
-
- public void setTarget(Notifier newTarget) {
- boolean isChanged = getTarget() != newTarget;
- if (newTarget == null) {
- super.setTarget(newTarget);
- cmpResource = null;
- } else if (newTarget instanceof ContainerManagedEntity) {
- //TODO - uncomment when compile errors are gone
- if (false)/* (EJBCommandCopier.isCodegenCopy(newTarget)) */
- newTarget.eAdapters().remove(this);
- else {
- Resource res = ((ContainerManagedEntity) newTarget).eResource();
- if (res != null && res.getResourceSet() != null) {
- super.setTarget(newTarget);
- if (isChanged)
- initializeTarget();
- }
- }
- }
- }
-
- /**
- *
- */
- private void initializeTarget() {
- ContainerManagedEntity cmp = (ContainerManagedEntity) getTarget();
- addAttributeMaintenanceAdapter(cmp.getEjbClass());
- if (shouldAddToPrimaryKeyClass(cmp))
- addAttributeMaintenanceAdapter(cmp.getPrimaryKey());
- }
-
- private boolean shouldAddToPrimaryKeyClass(ContainerManagedEntity cmp) {
- return cmp.getPrimKeyField() == null && cmp.getPrimaryKey() != null && !cmp.getPrimaryKey().getQualifiedName().startsWith("java.lang"); //$NON-NLS-1$
- }
-
- protected Resource getCMPResource() {
- if (cmpResource == null && getTarget() != null)
- cmpResource = ((EObject) getTarget()).eResource();
- return cmpResource;
- }
-
- protected boolean getCurrentModificationFlag() {
- return getCMPResource() != null && cmpResource.getContents() != null ? cmpResource.isModified() : false;
- }
-
- protected void setModificationFlag(boolean aBoolean) {
- if (getCMPResource() != null)
- getCMPResource().setModified(aBoolean);
- }
-
- public ContainerManagedEntity getCMP() {
- if (getTarget() instanceof ContainerManagedEntity)
- return (ContainerManagedEntity) getTarget();
- return null;
- }
-
- protected boolean flushPrimaryKeyClass(JavaClass primaryKeyClass) {
- // ensure the primary key class is flushed and reloaded to get latest
- // content
- IProject p = ProjectUtilities.getProject(primaryKeyClass);
- try {
- List natures = EMFNature.getRegisteredRuntimes(p);
- EMFNature nature = null;
- for (int i = 0; i < natures.size(); i++) {
- if (natures.get(i) instanceof EMFNature)
- nature = (EMFNature) natures.get(i);
- }
- List adapterFactories = nature.getResourceSet().getAdapterFactories();
- AdapterFactory factory = EcoreUtil.getAdapterFactory(adapterFactories, ReadAdaptor.TYPE_KEY);
- if (factory instanceof JavaJDOMAdapterFactory) {
- JavaJDOMAdapterFactory javaFactory = (JavaJDOMAdapterFactory) factory;
- javaFactory.flushReflectionNoNotification(primaryKeyClass.getQualifiedName());
- return true;
- }
- } catch (Exception e) {
- // We don't really care what the exception was, we'll just bail out
- // and return false;
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
deleted file mode 100644
index 49f9f5b..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
+++ /dev/null
@@ -1,713 +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.jst.j2ee.internal.common;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ManifestException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateInputProvider;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorImpl;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-public class ClasspathModel implements ResourceStateInputProvider, ResourceStateValidator {
-
- protected IProject project;
- protected IVirtualComponent selectedEARComponent;
- protected EARFile earFile;
- protected IVirtualComponent component;
- protected Archive archive;
- public EARArtifactEdit earArtifactEdit;
- /** The EAR nature runtimes for all the open EAR projects in the workspace */
- protected IVirtualComponent[] availableEARComponents = null;
- protected ClassPathSelection classPathSelection;
- protected List listeners;
- protected List nonResourceFiles;
- protected ResourceStateValidator stateValidator;
- protected ArchiveManifest manifest;
- public static String NO_EAR_MESSAGE = CommonEditResourceHandler.getString("NO_EAR_JARDEP_FOR_MOD_UI_"); //$NON-NLS-1$
- protected List targetWLPRefComponentList;
- protected boolean isWLPModel = false;
- protected ClassPathSelection classPathWLPSelection;
-
- protected Comparator comparator = new Comparator() {
- public int compare(Object o1, Object o2) {
- IVirtualComponent e1 = (IVirtualComponent) o1;
- IVirtualComponent e2 = (IVirtualComponent) o2;
- return e1.getProject().getName().compareTo(e2.getProject().getName());
- }
- };
-
-
- public ClasspathModel(ArchiveManifest initialManifest) {
- super();
- manifest = initialManifest;
- }
-
- public IProject getProject() {
- return project;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- initializeComponent();
- getAvailableEARComponents();
- }
-
- private void initializeComponent() {
- setComponent(ComponentCore.createComponent(getProject()));
- }
-
- protected IVirtualComponent[] refreshAvailableEARs() {
- if( component != null ){
- IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects(getComponent().getProject());
- availableEARComponents = ComponentUtilities.getComponents(earProjects);
- if (availableEARComponents != null && availableEARComponents.length > 0) {
- Arrays.sort(availableEARComponents, comparator);
- if (selectedEARComponent == null || !Arrays.asList(availableEARComponents).contains(selectedEARComponent)) {
- if (availableEARComponents.length > 0)
- selectedEARComponent = availableEARComponents[0];
- else
- selectedEARComponent = null;
- }
- }
- }
- return availableEARComponents;
- }
-
- public IVirtualComponent[] getAvailableEARComponents() {
- if (availableEARComponents == null)
- refreshAvailableEARs();
- return availableEARComponents;
- }
-
- /**
- * Gets the selectedEARComponent.
- *
- * @return Returns a EARNatureRuntime
- */
- public IVirtualComponent getSelectedEARComponent() {
- return selectedEARComponent;
- }
-
-
- public String getArchiveURI() {
- if (selectedEARComponent != null) {
- return getEARArtifactEdit().getModuleURI(getComponent());
- }
- return null;
- }
-
- public EARArtifactEdit getEARArtifactEdit() {
- if(earArtifactEdit == null || selectedEARComponentChanged())
- earArtifactEdit = EARArtifactEdit.getEARArtifactEditForRead(selectedEARComponent);
- return earArtifactEdit;
- }
-
- private boolean selectedEARComponentChanged() {
- if(earArtifactEdit != null && !earArtifactEdit.getComponent().getName().equals(selectedEARComponent.getName())) {
- earArtifactEdit.dispose();
- earArtifactEdit = null;
- return true;
- }
- return false;
- }
-
- protected void initializeEARFile() {
- if (selectedEARComponent == null || !isDDInEAR(selectedEARComponent)) {
- earFile = null;
- return;
- }
- try {
- earFile = (EARFile)getEARArtifactEdit().asArchive(false);
- } catch (OpenFailureException ex) {
- handleOpenFailureException(ex);
- }
- }
-
- /**
- * initializeSelection method comment.
- */
- protected void initializeSelection(ArchiveManifest existing) {
- try {
- initializeEARFile();
- initializeArchive();
- if (archive != null) {
- if (existing == null) {
- if (manifest != null)
- archive.setManifest(manifest);
- else
- //Load it now because we're going to close the EAR;
- //this might be a binary project
- archive.getManifest();
- } else
- archive.setManifest(existing);
- List archiveFiles = earFile.getArchiveFiles();
- for (int i = 0; i < archiveFiles.size(); i++) {
- Archive anArchive = (Archive) archiveFiles.get(i);
- try {
- if (anArchive.isEJBJarFile())
- ((EJBJarFile) anArchive).getDeploymentDescriptor();
- anArchive.getManifest();
- } catch (ManifestException mfEx) {
- Logger.getLogger().logError(mfEx);
- anArchive.setManifest((ArchiveManifest) new ArchiveManifestImpl());
- }
- }
- }
- } finally {
- if (earFile != null)
- earFile.close();
- }
- createClassPathSelection();
- }
-
- protected void initializeArchive() {
- if (earFile == null) {
- archive = null;
- return;
- }
- String uri = getArchiveURI();
- if (uri != null) {
- try {
- archive = (Archive) earFile.getFile(uri);
- } catch (java.io.FileNotFoundException ex) {
- archive = null;
- }
- }
- }
-
- protected void createClassPathSelection() {
- if (archive != null)
- classPathSelection = new ClassPathSelection(archive, earFile);
- else
- classPathSelection = null;
- }
-
- protected boolean isDDInEAR(IVirtualComponent aComponent) {
- IContainer mofRoot = aComponent.getProject();
- if (mofRoot == null || !mofRoot.exists())
- return false;
-
- return mofRoot.exists(new Path(aComponent.getRootFolder().getProjectRelativePath().toString() + "//" + J2EEConstants.APPLICATION_DD_URI)); //$NON-NLS-1$
- }
-
- protected void handleOpenFailureException(OpenFailureException ex) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- }
-
- public void dispose() {
- if(earArtifactEdit != null) {
- earArtifactEdit.dispose();
- earArtifactEdit = null;
- }
- }
-
- public ClassPathSelection getClassPathSelection() {
- if (classPathSelection == null)
- initializeSelection(null);
- return classPathSelection;
- }
-
- public void resetClassPathSelection(ArchiveManifest mf) {
- initializeSelection(mf);
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_RESET));
- }
-
- public void resetClassPathSelection() {
- resetClassPathSelection(null);
- }
-
- public void addListener(ClasspathModelListener listener) {
- if (listeners == null)
- listeners = new ArrayList();
-
- listeners.add(listener);
- }
-
- public void removeListener(ClasspathModelListener listener) {
- if (listeners != null)
- listeners.remove(listener);
- }
-
- public void fireNotification(ClasspathModelEvent evt) {
- if (listeners == null)
- return;
-
- for (int i = 0; i < listeners.size(); i++) {
- ClasspathModelListener listener = (ClasspathModelListener) listeners.get(i);
- listener.modelChanged(evt);
- }
- }
-
- /**
- * Sets the isSelected for the classpath element and sends out a notification of type
- * {@link ClasspathModelEvent#CLASS_PATH_CHANGED}
- */
- public void setSelection(ClasspathElement element, boolean selected) {
- element.setSelected(selected);
- if (!isWLPModel()) {
- updateManifestClasspath();
- } else {
- // at least fire the change event
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_CHANGED));
- }
- }
-
- /**
- * Select or deselect all and notify
- */
- public void setAllClasspathElementsSelected(boolean selected) {
- ClassPathSelection s = getClassPathSelection();
- if (s != null) {
- s.setAllSelected(selected);
- updateManifestClasspath();
- }
- }
-
- /**
- * Select or deselect all and notify
- */
- public void setAllClasspathElementsSelected(List elements, boolean selected) {
- ClassPathSelection s = getClassPathSelection();
- if (s != null) {
- s.setAllSelected(elements, selected);
- updateManifestClasspath();
- }
- }
-
- /**
- * Gets the archive.
- *
- * @return Returns a Archive
- */
- public Archive getArchive() {
- return archive;
- }
-
- /**
- * Updates the manifest Class-Path:, and sends out a notification of type
- * {@link ClasspathModelEvent#CLASS_PATH_CHANGED}
- */
- public void updateManifestClasspath() {
- if (classPathSelection != null && classPathSelection.isModified()) {
- archive.getManifest().setClassPath(classPathSelection.toString());
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_CHANGED));
- }
- }
-
- /**
- * Updates the manifest Main-Class:, and sends out a notification of type
- * {@link ClasspathModelEvent#MAIN_CLASS_CHANGED}
- */
- public void updateMainClass(String mainClass) {
- archive.getManifest().setMainClass(mainClass);
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.MAIN_CLASS_CHANGED));
- }
-
- /**
- * Updates the manifest Main-Class:, and sends out a notification of type
- * {@link ClasspathModelEvent#MAIN_CLASS_CHANGED}
- */
- public void updateImplVersion(String implVersion) {
- archive.getManifest().setImplemenationVersion(implVersion);
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.IMPL_VERSION_CHANGED));
- }
-
- public void fireSavedEvent() {
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.MODEL_SAVED));
- }
-
- /**
- * Sets the manifest without touching the archive, or notifying
- */
- public void primSetManifest(ArchiveManifest mf) {
- manifest = mf;
- }
-
- /**
- * Sets the manfest on the archive, updates the classpath selection, and notifies
- */
- public void setManifest(ArchiveManifest manifest) {
- archive.setManifest(manifest);
- getClassPathSelection(); //Ensure the selection is initialized.
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.MANIFEST_CHANGED));
- }
-
- public void selectEAR(int index) {
- ArchiveManifest mf = new ArchiveManifestImpl((ArchiveManifestImpl) getArchive().getManifest());
- earFile.close();
- selectedEARComponent = availableEARComponents[index];
- initializeSelection(mf);
- fireNotification(new ClasspathModelEvent(ClasspathModelEvent.EAR_PROJECT_CHANGED));
- }
-
- public void moveUp(List toMoveUp) {
- getClassPathSelection().moveUp(toMoveUp);
- updateManifestClasspath();
- }
-
- public void moveDown(List toMoveDown) {
- getClassPathSelection().moveDown(toMoveDown);
- updateManifestClasspath();
- }
-
- public void refresh() {
- ArchiveManifest mf = null;
- if (archive != null)
- mf = new ArchiveManifestImpl((ArchiveManifestImpl) getArchive().getManifest());
- refreshAvailableEARs();
- resetClassPathSelection(mf);
- }
-
-
- /**
- * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#cacheNonResourceValidateState(List)
- */
- public void cacheNonResourceValidateState(List roNonResourceFiles) {
- }
-
-
- /**
- * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getNonResourceFiles()
- */
- public List getNonResourceFiles() {
- if (nonResourceFiles == null)
- initNonResourceFiles();
- return nonResourceFiles;
- }
-
- protected void initNonResourceFiles() {
- //Might be opened from a JAR
- if (getComponent() == null)
- return;
- nonResourceFiles = new ArrayList(3);
- nonResourceFiles.add(getComponent().getProject().getFile(ProjectUtilities.DOT_PROJECT));
- nonResourceFiles.add(getComponent().getProject().getFile(ProjectUtilities.DOT_CLASSPATH));
- IFile mf = J2EEProjectUtilities.getManifestFile(getComponent().getProject());
- if (mf != null)
- nonResourceFiles.add(mf);
- }
-
-
- /**
- * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getNonResourceInconsistentFiles()
- */
- public List getNonResourceInconsistentFiles() {
- return null;
- }
-
- /**
- * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#isDirty()
- */
- public boolean isDirty() {
- ClassPathSelection selection = getClassPathSelection();
- if (selection == null)
- return false;
- return selection.isModified();
- }
-
-
- /**
- * Return a list of all the files that will get modified as a result of running this operation;
- * used for validateEdit
- */
- public Set getAffectedFiles() {
- Set result = new HashSet();
- IFile aFile = J2EEProjectUtilities.getManifestFile(getComponent().getProject());
- if (aFile != null && aFile.exists())
- result.add(aFile);
- result.addAll(ProjectUtilities.getFilesAffectedByClasspathChange(getComponent().getProject()));
- return result;
- }
-
- /**
- * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getResources()
- */
- public List getResources() {
- return Collections.EMPTY_LIST;
- }
-
- public boolean selectDependencyIfNecessary(IProject referencedProject) {
- getClassPathSelection();
- if (classPathSelection == null || classPathSelection.hasDirectOrIndirectDependencyTo(referencedProject))
- return false;
-
- ClasspathElement element = classPathSelection.getClasspathElement(referencedProject);
- if (element != null) {
- setSelection(element, true);
- return true;
- }
- return false;
- }
-
- public boolean selectDependencyIfNecessary(String jarName) {
- getClassPathSelection();
- if (classPathSelection == null || classPathSelection.hasDirectOrIndirectDependencyTo(jarName))
- return false;
-
- ClasspathElement element = classPathSelection.getClasspathElement(jarName);
- if (element != null) {
- setSelection(element, true);
- return true;
- }
- return false;
- }
-
- public void removeDependency(String jarName) {
- getClassPathSelection();
- if (classPathSelection == null)
- return;
-
- ClasspathElement element = classPathSelection.getClasspathElement(jarName);
- if (element != null && element.isValid())
- setSelection(element, false);
- }
-
- public void removeDependency(IProject referencedProject) {
- getClassPathSelection();
- if (classPathSelection == null)
- return;
-
- ClasspathElement element = classPathSelection.getClasspathElement(referencedProject);
- if (element != null && element.isValid())
- setSelection(element, false);
- }
-
- public void selectFilterLevel(int filterLevel) {
- getClassPathSelection();
- if (classPathSelection != null)
- classPathSelection.selectFilterLevel(filterLevel);
- updateManifestClasspath();
- }
-
- /**
- * Gets the stateValidator.
- *
- * @return Returns a ResourceStateValidator
- */
- public ResourceStateValidator getStateValidator() {
- if (stateValidator == null)
- stateValidator = createStateValidator();
- return stateValidator;
- }
-
- /**
- * Method createStateValidator.
- *
- * @return ResourceStateValidator
- */
- private ResourceStateValidator createStateValidator() {
- return new ResourceStateValidatorImpl(this);
- }
-
- /**
- * @see ResourceStateValidator#checkActivation(ResourceStateValidatorPresenter)
- */
- public void checkActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- getStateValidator().checkActivation(presenter);
- }
-
- /**
- * @see ResourceStateValidator#lostActivation(ResourceStateValidatorPresenter)
- */
- public void lostActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- getStateValidator().lostActivation(presenter);
- }
-
- /**
- * @see ResourceStateValidator#validateState(ResourceStateValidatorPresenter)
- */
- public IStatus validateState(ResourceStateValidatorPresenter presenter) throws CoreException {
- return getStateValidator().validateState(presenter);
- }
-
- /**
- * @see ResourceStateValidator#checkSave(ResourceStateValidatorPresenter)
- */
- public boolean checkSave(ResourceStateValidatorPresenter presenter) throws CoreException {
- return getStateValidator().checkSave(presenter);
- }
-
- /**
- * @see ResourceStateValidator#checkReadOnly()
- */
- public boolean checkReadOnly() {
- return getStateValidator().checkReadOnly();
- }
-
- public IVirtualComponent getComponent() {
- return component;
- }
-
- public void setComponent(IVirtualComponent component) {
- this.component = component;
- }
-
- public ClassPathSelection getClassPathSelectionForWLPs() {
- if(classPathWLPSelection == null)
- initializeSelectionForWLPs();
- return classPathWLPSelection;
- }
-
- private void initializeSelectionForWLPs() {
- classPathWLPSelection = new ClassPathSelection();
- try {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(component.getProject());
- IClasspathEntry[] entry = javaProject.getRawClasspath();
- List allValidUtilityProjects = J2EEProjectUtilities.getAllJavaNonFlexProjects();
- IProject[] utilityProjects = J2EEProjectUtilities.getAllProjectsInWorkspaceOfType(J2EEProjectUtilities.UTILITY);
- allValidUtilityProjects.addAll(Arrays.asList(utilityProjects));
- for (int i = 0; i < allValidUtilityProjects.size(); i++) {
- IProject utilProject = null;
- if (allValidUtilityProjects.get(i) instanceof IProject)
- utilProject = (IProject) allValidUtilityProjects.get(i);
- else if (allValidUtilityProjects.get(i) instanceof IVirtualComponent)
- utilProject = ((IVirtualComponent) allValidUtilityProjects.get(i)).getProject();
- boolean existingEntry = false;
- for (int j = 0; j < entry.length; j++) {
- IClasspathEntry eachEntry = entry[j];
- if (eachEntry.getEntryKind() == IClasspathEntry.CPE_PROJECT && eachEntry.getPath().toString().equals("/" + utilProject.getName())) { //$NON-NLS-1$
- IVirtualReference ref = component.getReference(utilProject.getName());
- IPath path = new Path("/WEB-INF/lib");
- if( ref != null && ref.getRuntimePath().equals(path)){
- existingEntry = true;
- }
- break;
- }
- }
- classPathWLPSelection.createProjectElement(utilProject, existingEntry);
- classPathWLPSelection.setFilterLevel(ClassPathSelection.FILTER_NONE);
- }
-
- if( component != null && J2EEProjectUtilities.isDynamicWebProject(component.getProject())){
- IVirtualReference[] newrefs = component.getReferences();
- for( int i=0; i < newrefs.length; i++){
- IVirtualReference ref = newrefs[i];
- IVirtualComponent referencedComponent = ref.getReferencedComponent();
- if (referencedComponent == null)
- continue;
- boolean isBinary = referencedComponent.isBinary();
- if( isBinary ){
- //String uri = ComponentUtilities.getResolvedPathForArchiveComponent(referencedComponent.getName()).toString();
- String unresolvedURI = ""; //$NON-NLS-1$
- try {
- unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)));
- } catch (UnresolveableURIException e) {
- e.printStackTrace();
- }
- URI archiveURI = URI.createURI(unresolvedURI);
-
- boolean alreadyInList = false;
- Iterator iter = classPathWLPSelection.getClasspathElements().iterator();
- while(iter.hasNext()){
- ClasspathElement tmpelement = (ClasspathElement)iter.next();
- if( tmpelement.getText().equals(archiveURI.lastSegment())){
- alreadyInList = true;
- break;
- }
- }
- ClasspathElement element = null;
- if( !alreadyInList ){
- if( inClassPath(javaProject, archiveURI.lastSegment())){
- element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), referencedComponent.getName(), archiveURI.lastSegment());
- classPathWLPSelection.addClasspathElement(element, unresolvedURI);
- }
- else
- {
- element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), null);
- classPathWLPSelection.addClasspathElement(element, unresolvedURI);
- }
- }
- }
- } //for
- }
-// for (int j = 0; j < entry.length; j++) {
-// IClasspathEntry eachEntry = entry[j];
-// if (eachEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY ) {
-// classPathWLPSelection.crcrecreateProjectElement(utilProject, existingEntry);
-// }
-// }
- } catch (CoreException e) {
- }catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
-
- boolean inClassPath(IJavaProject javaProject, String archiveName ){
- boolean existingEntry = false;
- IClasspathEntry[] entry = null;
- try {
- entry = javaProject.getRawClasspath();
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
- for (int j = 0; j < entry.length; j++) {
- IClasspathEntry eachEntry = entry[j];
- if (eachEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY || eachEntry.getEntryKind() == IClasspathEntry.CPE_VARIABLE ) {
- if( eachEntry.getPath().lastSegment().equals(archiveName)){
- existingEntry = true;
- break;
- }
- }
- }
- return existingEntry;
- }
-
-
- public boolean isWLPModel() {
- return isWLPModel;
- }
-
- public void setWLPModel(boolean isWLPModel) {
- this.isWLPModel = isWLPModel;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelEvent.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelEvent.java
deleted file mode 100644
index 388409f..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelEvent.java
+++ /dev/null
@@ -1,42 +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.jst.j2ee.internal.common;
-
-
-public class ClasspathModelEvent extends Object {
- protected int eventType;
- public static final int CLASS_PATH_CHANGED = 1;
- public static final int EAR_PROJECT_CHANGED = 2;
- public static final int MANIFEST_CHANGED = 3;
- public static final int CLASS_PATH_RESET = 4;
- public static final int MAIN_CLASS_CHANGED = 5;
- public static final int MODEL_SAVED = 6;
- public static final int IMPL_VERSION_CHANGED = 7;
-
- /**
- * Constructor for ClasspathModelEvent.
- */
- public ClasspathModelEvent(int eventType) {
- super();
- this.eventType = eventType;
- }
-
- /**
- * Gets the eventType.
- *
- * @return Returns a int
- */
- public int getEventType() {
- return eventType;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelListener.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelListener.java
deleted file mode 100644
index c3333f3..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelListener.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.jst.j2ee.internal.common;
-
-
-public interface ClasspathModelListener {
- void modelChanged(ClasspathModelEvent evt);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CreationConstants.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CreationConstants.java
deleted file mode 100644
index 8f6cf92..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CreationConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.common;
-
-public interface CreationConstants {
-
- String DEFAULT_WEB_SOURCE_FOLDER = "src"; //$NON-NLS-1$
- String DEFAULT_EJB_SOURCE_FOLDER = "ejbModule";//$NON-NLS-1$
- String DEFAULT_CONNECTOR_SOURCE_FOLDER = "connectorModule";//$NON-NLS-1$
- String DEFAULT_APPCLIENT_SOURCE_FOLDER = "appClientModule";//$NON-NLS-1$
- String EJB_CLIENT_NAME ="ClientProject";//$NON-NLS-1$
- String CLIENT_JAR_URI="ClientJARURI";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EECommonMessages.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EECommonMessages.java
deleted file mode 100644
index bf57027..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EECommonMessages.java
+++ /dev/null
@@ -1,72 +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
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class J2EECommonMessages extends NLS {
- private static final String BUNDLE_NAME = "j2ee_common";//$NON-NLS-1$
-
- private J2EECommonMessages() {
- // Do not instantiate
- }
-
- public static String ERR_SECURITY_ROLE_EMPTY;
- public static String ERR_SECURITY_ROLE_EXIST;
- public static String ERR_JAVA_CLASS_NAME_EMPTY;
- public static String ERR_JAVA_CLASS_NAME_EXIST;
- public static String ERR_JAVA_CLASS_FILE_NAME_EXIST;
- public static String ERR_JAVA_CLASS_FOLDER_NAME_EMPTY;
- public static String ERR_JAVA_CLASS_FOLDER_PROJECT_NOT_OPEN;
- public static String ERR_JAVA_CLASS_NOT_JAVA_PROJECT;
- public static String ERR_JAVA_CLASS_FOLDER_STATIC_PROJECT;
- public static String ERR_JAVA_CLASS_FOLDER_NOT_SOURCE;
- public static String ERR_JAVA_CLASS_NAME_QUALIFIED;
- public static String ERR_JAVA_CLASS_NAME_INVALID;
- public static String ERR_JAVA_CLASS_NAME_WARNING;
- public static String ERR_JAVA_CLASS_SUPERCLASS_NOT_EXIST;
- public static String ERR_JAVA_CLASS_SUPERCLASS_FINAL;
- public static String ERR_JAVA_PACAKGE_NAME_INVALID;
- public static String ERR_JAVA_PACKAGE_NAME_WARNING;
- public static String ERR_BOTH_FINAL_AND_ABSTRACT;
- public static String WebServiceClientGenerator_UI_0;
- public static String ERR_SECURITY_ROLE_LIST_EMPTY;
-
- public static String ERR_JAVA_CLASS_FOLDER_NOT_EXIST;
-
- public static String ERR_EMPTY_MODULE_NAME;
- public static String ERR_EMPTY_PROJECT_NAME;
- public static String ERR_PROJECT_NAME_EXISTS;
- public static String ERR_VERSION_NOT_SUPPORTED;
- public static String ERR_NOT_SUPPORTED;
- public static String ERR_JAVA_CLASS_FOLDER_NOT_ABSOLUTE;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, J2EECommonMessages.class);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
deleted file mode 100644
index f51d2e5..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Mar 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author nagrawal
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEVersionUtil {
-
- public static String getServletTextVersion(int aVersion) {
- switch (aVersion) {
- case J2EEVersionConstants.SERVLET_2_2:
- return J2EEVersionConstants.VERSION_2_2_TEXT;
-
- case J2EEVersionConstants.SERVLET_2_3:
- return J2EEVersionConstants.VERSION_2_3_TEXT;
-
- case J2EEVersionConstants.SERVLET_2_4:
- return J2EEVersionConstants.VERSION_2_4_TEXT;
- }
- return ""; //$NON-NLS-1$
-
- }
-
- public static String getEJBTextVersion(int aVersion) {
-
- switch (aVersion) {
- case J2EEVersionConstants.EJB_1_0_ID:
- return J2EEVersionConstants.VERSION_1_0_TEXT;
-
- case J2EEVersionConstants.EJB_1_1_ID:
- return J2EEVersionConstants.VERSION_1_1_TEXT;
-
- case J2EEVersionConstants.EJB_2_0_ID:
- return J2EEVersionConstants.VERSION_2_0_TEXT;
-
- case J2EEVersionConstants.EJB_2_1_ID:
- return J2EEVersionConstants.VERSION_2_1_TEXT;
- }
- return ""; //$NON-NLS-1$
- }
-
- public static String getJCATextVersion(int aVersion) {
- switch (aVersion) {
- case J2EEVersionConstants.JCA_1_0_ID:
- return J2EEVersionConstants.VERSION_1_0_TEXT;
-
- case J2EEVersionConstants.JCA_1_5_ID:
- return J2EEVersionConstants.VERSION_1_5_TEXT;
-
- }
- return ""; //$NON-NLS-1$
- }
-
- public static String getJ2EETextVersion(int aVersion) {
- switch (aVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return J2EEVersionConstants.VERSION_1_2_TEXT;
-
- case J2EEVersionConstants.J2EE_1_3_ID:
- return J2EEVersionConstants.VERSION_1_3_TEXT;
-
- case J2EEVersionConstants.J2EE_1_4_ID:
- return J2EEVersionConstants.VERSION_1_4_TEXT;
-
- }
- return "";//$NON-NLS-1$
- }
-
- public static int convertAppClientVersionStringToJ2EEVersionID(String version) {
- if (version.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- return J2EEVersionConstants.J2EE_1_2_ID;
- if (version.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- return J2EEVersionConstants.J2EE_1_3_ID;
- if (version.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- return J2EEVersionConstants.J2EE_1_4_ID;
- // default
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
-
- public static int convertEJBVersionStringToJ2EEVersionID(String version) {
- if (version.equals(J2EEVersionConstants.VERSION_1_1_TEXT))
- return J2EEVersionConstants.J2EE_1_2_ID;
- if (version.equals(J2EEVersionConstants.VERSION_2_0_TEXT))
- return J2EEVersionConstants.J2EE_1_3_ID;
- if (version.equals(J2EEVersionConstants.VERSION_2_1_TEXT))
- return J2EEVersionConstants.J2EE_1_4_ID;
- // default
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
-
- public static int convertWebVersionStringToJ2EEVersionID(String version) {
- if (version.equals(J2EEVersionConstants.VERSION_2_2_TEXT))
- return J2EEVersionConstants.J2EE_1_2_ID;
- if (version.equals(J2EEVersionConstants.VERSION_2_3_TEXT))
- return J2EEVersionConstants.J2EE_1_3_ID;
- if (version.equals(J2EEVersionConstants.VERSION_2_4_TEXT))
- return J2EEVersionConstants.J2EE_1_4_ID;
- // default
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
-
- public static int convertConnectorVersionStringToJ2EEVersionID(String version) {
- if (version.equals(J2EEVersionConstants.VERSION_1_0_TEXT))
- return J2EEVersionConstants.J2EE_1_3_ID;
- if (version.equals(J2EEVersionConstants.VERSION_1_5_TEXT))
- return J2EEVersionConstants.J2EE_1_4_ID;
- // default
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
-
- public static int convertJ2EEVersionIDToEJBVersionID(int j2eeVersionId) {
- switch (j2eeVersionId) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return J2EEVersionConstants.EJB_1_1_ID;
- case J2EEVersionConstants.J2EE_1_3_ID:
- return J2EEVersionConstants.EJB_2_0_ID;
- case J2EEVersionConstants.J2EE_1_4_ID:
- return J2EEVersionConstants.EJB_2_1_ID;
- }
- // default
- return J2EEVersionConstants.EJB_2_1_ID;
- }
-
- public static int convertJ2EEVersionIDToWebVersionID(int j2eeVersionId) {
- switch (j2eeVersionId) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return J2EEVersionConstants.WEB_2_2_ID;
- case J2EEVersionConstants.J2EE_1_3_ID:
- return J2EEVersionConstants.WEB_2_3_ID;
- case J2EEVersionConstants.J2EE_1_4_ID:
- return J2EEVersionConstants.WEB_2_4_ID;
- }
- // default
- return J2EEVersionConstants.WEB_2_4_ID;
- }
-
- public static int convertJ2EEVersionIDToConnectorVersionID(int j2eeVersionId) {
- switch (j2eeVersionId) {
- case J2EEVersionConstants.J2EE_1_3_ID:
- return J2EEVersionConstants.JCA_1_0_ID;
- case J2EEVersionConstants.J2EE_1_4_ID:
- return J2EEVersionConstants.JCA_1_5_ID;
- }
- // default
- return J2EEVersionConstants.JCA_1_5_ID;
- }
-
- public static int convertVersionStringToInt(IVirtualComponent comp) {
- String version = J2EEProjectUtilities.getJ2EEProjectVersion(comp.getProject());
- if (J2EEProjectUtilities.isDynamicWebProject(comp.getProject()))
- return convertWebVersionStringToJ2EEVersionID(version);
- if (J2EEProjectUtilities.isEJBProject(comp.getProject()))
- return convertEJBVersionStringToJ2EEVersionID(version);
- if (J2EEProjectUtilities.isEARProject(comp.getProject()))
- return convertVersionStringToInt(version);
- if (J2EEProjectUtilities.isJCAProject(comp.getProject()))
- return convertConnectorVersionStringToJ2EEVersionID(version);
- if (J2EEProjectUtilities.isApplicationClientProject(comp.getProject()))
- return convertAppClientVersionStringToJ2EEVersionID(version);
- return 0;
- }
-
- public static int convertVersionStringToInt(String version) {
- int nVersion = 0;
-
- if( version.endsWith("")){ //$NON-NLS-1$
- nVersion = 0;
- }
- if (version.equals(J2EEVersionConstants.VERSION_1_0_TEXT))
- nVersion = J2EEVersionConstants.VERSION_1_0;
-
- if (version.equals(J2EEVersionConstants.VERSION_1_1_TEXT))
- nVersion = J2EEVersionConstants.VERSION_1_1;
-
- if (version.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- nVersion = J2EEVersionConstants.VERSION_1_2;
-
- if (version.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- nVersion = J2EEVersionConstants.VERSION_1_3;
-
- if (version.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- nVersion = J2EEVersionConstants.VERSION_1_4;
-
- if (version.equals(J2EEVersionConstants.VERSION_1_5_TEXT))
- nVersion = J2EEVersionConstants.VERSION_1_5;
-
- if (version.equals(J2EEVersionConstants.VERSION_2_0_TEXT))
- nVersion = J2EEVersionConstants.VERSION_2_0;
-
- if (version.equals(J2EEVersionConstants.VERSION_2_1_TEXT))
- nVersion = J2EEVersionConstants.VERSION_2_1;
-
- if (version.equals(J2EEVersionConstants.VERSION_2_2_TEXT))
- nVersion = J2EEVersionConstants.VERSION_2_2;
-
- if (version.equals(J2EEVersionConstants.VERSION_2_3_TEXT))
- nVersion = J2EEVersionConstants.VERSION_2_3;
-
- if (version.equals(J2EEVersionConstants.VERSION_2_4_TEXT))
- nVersion = J2EEVersionConstants.VERSION_2_4;
-
- if (version.equals(J2EEVersionConstants.VERSION_2_5_TEXT))
- nVersion = J2EEVersionConstants.VERSION_2_5;
-
- return nVersion;
- }
- public static String convertVersionIntToString(int version) {
- String nVersion = null;
-
- if (version == J2EEVersionConstants.VERSION_1_0)
- nVersion = J2EEVersionConstants.VERSION_1_0_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_1_1)
- nVersion = J2EEVersionConstants.VERSION_1_1_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_1_2)
- nVersion = J2EEVersionConstants.VERSION_1_2_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_1_3)
- nVersion = J2EEVersionConstants.VERSION_1_3_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_1_4)
- nVersion = J2EEVersionConstants.VERSION_1_4_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_1_5)
- nVersion = J2EEVersionConstants.VERSION_1_5_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_2_0)
- nVersion = J2EEVersionConstants.VERSION_2_0_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_2_1)
- nVersion = J2EEVersionConstants.VERSION_2_1_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_2_2)
- nVersion = J2EEVersionConstants.VERSION_2_2_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_2_3)
- nVersion = J2EEVersionConstants.VERSION_2_3_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_2_4)
- nVersion = J2EEVersionConstants.VERSION_2_4_TEXT;
-
- if (version == J2EEVersionConstants.VERSION_2_5)
- nVersion = J2EEVersionConstants.VERSION_2_5_TEXT;
-
- return nVersion;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java
deleted file mode 100644
index 9c95a7f..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java
+++ /dev/null
@@ -1,91 +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.jst.j2ee.internal.common;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class UpdateProjectClasspath {
-
-
- public UpdateProjectClasspath(String sourceFolder, String componentName, IProject jProject){
- addSrcFolderToProject(sourceFolder, componentName, jProject);
- }
-
- private IClasspathEntry[] getClasspathEntries(String sourceFolder, String componentName,
- IProject jProject) {
-
- ArrayList list = new ArrayList();
- list.add(JavaCore.newSourceEntry(jProject.getFullPath().append(sourceFolder)));
-
- IClasspathEntry[] classpath = new IClasspathEntry[list.size()];
-
-
- IPath newOutputPath = null;
- for (int i = 0; i < classpath.length; i++) {
- classpath[i] = (IClasspathEntry) list.get(i);
- newOutputPath = Path.fromOSString(Path.SEPARATOR +jProject.getName() + "/bin/");
- ((ClasspathEntry)classpath[i]).specificOutputLocation = newOutputPath;
- }
- return classpath;
- }
-
- private void addSrcFolderToProject(String sourceFolder,String componentName,
- IProject jProject) {
-
- IJavaProject javaProject = JavaCore.create( jProject );
- try {
-
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- List oldEntriesList,classpathList;
- IClasspathEntry[] newEntries = getClasspathEntries(sourceFolder, componentName,
- jProject);
- /**
- * Warning clean-up 12/05/2005
- */
- //int oldSize = oldEntries.length;
- //int newSize = newEntries.length;
-
- classpathList = new ArrayList();
- oldEntriesList = Arrays.asList(oldEntries);
- classpathList.addAll(oldEntriesList);
- for( int j=0; j< newEntries.length; j++){
- if(!oldEntriesList.contains(newEntries[j])) {
- classpathList.add(newEntries[j]);
- }
- }
- IClasspathEntry[] classpathEntries = (IClasspathEntry[]) classpathList.toArray(new IClasspathEntry[classpathList.size()]);
- javaProject.setRawClasspath(classpathEntries, null);
- }
- catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/VirtualArchiveComponentAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/VirtualArchiveComponentAdapterFactory.java
deleted file mode 100644
index a7b6a33..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/VirtualArchiveComponentAdapterFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.common;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-
-public class VirtualArchiveComponentAdapterFactory implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == VirtualArchiveComponent.ADAPTER_TYPE ) {
- VirtualArchiveComponent component = (VirtualArchiveComponent) adaptableObject;
- IPath path = J2EEProjectUtilities.getResolvedPathForArchiveComponent(component.getName());
- return path;
- }
- return null;
- }
-
-
- public Class[] getAdapterList() {
- return new Class[]{VirtualArchiveComponent.class};
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/INewJavaClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/INewJavaClassDataModelProperties.java
deleted file mode 100644
index 1d23d6c..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/INewJavaClassDataModelProperties.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.common.operations;
-
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-
-public interface INewJavaClassDataModelProperties extends IArtifactEditOperationDataModelProperties {
-
- /**
- * Required, String property used to set the unqualified java class name for the new java class.
- */
- public static final String CLASS_NAME = "NewJavaClassDataModel.CLASS_NAME"; //$NON-NLS-1$
-
- /**
- * Optional, String property used to set the source folder location for the new java class. The first
- * source folder found in the project will be used if one is not specified.
- */
- public static final String SOURCE_FOLDER = "NewJavaClassDataModel.SOURCE_FOLDER"; //$NON-NLS-1$
-
- /**
- * Optional, String property used to to set the java package for the new java class. The default
- * package is used if one is not specified.
- */
- public static final String JAVA_PACKAGE = "NewJavaClassDataModel.JAVA_PACKAGE"; //$NON-NLS-1$
-
- /**
- * Optional, String property used to set the qualified java class name of the superclass of the
- * new java class.
- */
- public static final String SUPERCLASS = "NewJavaClassDataModel.SUPERCLASS"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to set the visibility of the new java class. This is true
- * by default.
- */
- public static final String MODIFIER_PUBLIC = "NewJavaClassDataModel.MODIFIER_PUBLIC"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to set whether the new java class is abstract. This is false
- * by default.
- */
- public static final String MODIFIER_ABSTRACT = "NewJavaClassDataModel.MODIFIER_ABSTRACT"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to set whether the new java class is declared final. This is false
- * by default.
- */
- public static final String MODIFIER_FINAL = "NewJavaClassDataModel.MODIFIER_FINAL"; //$NON-NLS-1$
-
- /**
- * Optional, List property of all the qualified names of interfaces the new java class should implement.
- */
- public static final String INTERFACES = "NewJavaClassDataModel.INTERFACES"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to set whether the new java class should generate a main method. This
- * is false by default.
- */
- public static final String MAIN_METHOD = "NewJavaClassDataModel.MAIN_METHOD"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to set whether or not the constructor from the superclass should be
- * generated in the new java class. The default value is true.
- */
- public static final String CONSTRUCTOR = "NewJavaClassDataModel.CONSTRUCTOR"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to set whether the new java class should add method stubs for unimplemented
- * methods defined in the interfaces of the interface list. This is true by default.
- */
- public static final String ABSTRACT_METHODS = "NewJavaClassDataModel.ABSTRACT_METHODS"; //$NON-NLS-1$
-
- /**
- * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
- */
- public static final String JAVA_PACKAGE_FRAGMENT_ROOT = "NewJavaClassDataModel.JAVA_PACKAGE_FRAGMENT_ROOT"; //$NON-NLS-1$
-
- /**
- * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
- */
- public static final String JAVA_SOURCE_FOLDER = "NewJavaClassDataModel.JAVA_SOURCE_FOLDER"; //$NON-NLS-1$
-
- /**
- * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
- */
- public static final String PROJECT = "NewJavaClassDataModel.PROJECT"; //$NON-NLS-1$
-
- /**
- * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
- */
- public static final String QUALIFIED_CLASS_NAME = "NewJavaClassDataModel.QUALIFIED_CLASS_NAME"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java
deleted file mode 100644
index 16fa74f..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java
+++ /dev/null
@@ -1,195 +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.jst.j2ee.internal.common.operations;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper;
-
-
-/**
- * Insert the type's description here. Creation date: (4/8/2001 10:13:52 PM)
- *
- * @author: Administrator
- */
-public class J2EEModifierHelperCreator {
-
- public static ModifierHelper createAssemblyDescriptorHelper(EJBJar anEJBJar) {
- if (anEJBJar == null || anEJBJar.getAssemblyDescriptor() != null)
- return null;
- EjbPackage pack = EjbFactoryImpl.getPackage();
- EStructuralFeature sf = pack.getEJBJar_AssemblyDescriptor();
- return new ModifierHelper(anEJBJar, sf, null);
- }
-
- /**
- * return modifier helper that will create a method element with method type and param
- * associated with the methodSig and the methodpermission will be derived from the security
- * role.
- */
-
- public static ModifierHelper createMethodElementAsCopyHelper(MethodElement element, SecurityRole role) {
- if (role == null)
- return null;
- ModifierHelper tempHelper = new ModifierHelper();
- setMethodPermissionOwnerHelper(tempHelper, role);
- tempHelper.setFeature(getEjbPackage().getMethodPermission_MethodElements());
- tempHelper.setValue(EtoolsCopyUtility.createCopy(element));
- return tempHelper;
- }
-
- /**
- * return modifier helper that will create a method element with method type and param
- * associated with the methodSig and the methodpermission will be derived from the security
- * role.
- */
-
- public static ModifierHelper createMethodElementHelper(EnterpriseBean bean, SecurityRole role, String methodType, String methodSig) {
- if (role == null)
- return null;
- ModifierHelper tempHelper = new ModifierHelper();
- setMethodPermissionOwnerHelper(tempHelper, role);
- tempHelper.setFeature(getEjbPackage().getMethodPermission_MethodElements());
- tempHelper.addAttribute(getEjbPackage().getMethodElement_Type(), methodType);
- int index = methodSig.indexOf("(");//$NON-NLS-1$
- String methodName = methodSig;
- String methodParms = null;
- if (index > -1) {
- methodName = methodSig.substring(0, index);
- methodParms = methodSig.substring(index + 1, methodSig.length() - 1);
- }
- if (methodParms != null)
- methodParms = methodParms.replace(',', ' ');
- tempHelper.addAttribute(getEjbPackage().getMethodElement_Name(), methodName);
- if (methodParms != null)
- tempHelper.addAttribute(getEjbPackage().getMethodElement_Parms(), methodParms);
- tempHelper.addAttribute(getEjbPackage().getMethodElement_EnterpriseBean(), bean);
- return tempHelper;
- }
-
- /**
- * return modifier helper that will create a method element with method type and param
- * associated with the methodSig and a new methodtransacton for a transtype.
- */
-
- public static ModifierHelper createMethodElementHelper(EnterpriseBean bean, String methodType, String methodSig, String transType) {
- if (bean == null)
- return null;
- ModifierHelper ownerHelper = createMethodTransactionHelper((EJBJar) bean.eContainer(), transType);
- ModifierHelper tempHelper = new ModifierHelper();
- tempHelper.setOwnerHelper(ownerHelper);
- tempHelper.setFeature(getEjbPackage().getMethodTransaction_MethodElements());
- tempHelper.addAttribute(getEjbPackage().getMethodElement_Type(), methodType);
- int index = methodSig.indexOf("(");//$NON-NLS-1$
- String methodName = methodSig;
- String methodParms = null;
- if (index > -1) {
- methodName = methodSig.substring(0, index);
- methodParms = methodSig.substring(index + 1, methodSig.length() - 1);
- }
- if (methodParms != null)
- methodParms = methodParms.replace(',', ' ');
- tempHelper.addAttribute(getEjbPackage().getMethodElement_Name(), methodName);
- if (methodParms != null)
- tempHelper.addAttribute(getEjbPackage().getMethodElement_Parms(), methodParms);
- tempHelper.addAttribute(getEjbPackage().getMethodElement_EnterpriseBean(), bean);
- return tempHelper;
- }
-
- public static ModifierHelper createMethodPermissionHelper(SecurityRole role) {
-
- if (role == null)
- return null;
-
- AssemblyDescriptor assembly = (AssemblyDescriptor) role.eContainer();
- EStructuralFeature sf = EjbPackage.eINSTANCE.getAssemblyDescriptor_MethodPermissions();
- ModifierHelper tempHelper = new ModifierHelper(assembly, sf, null);
- tempHelper.addAttribute(getEjbPackage().getMethodPermission_Roles(), role);
- return tempHelper;
- }
-
- /**
- * Create a helper that will create a new MethodTransaction with
- *
- * @aTransType.
- */
- public static ModifierHelper createMethodTransactionHelper(EJBJar anEJBJar, String aTransType) {
- if (anEJBJar == null)
- return null;
- ModifierHelper helper = new ModifierHelper();
- setAssemblyDescriptorOwnerHelper(helper, anEJBJar);
- helper.setFeature(getEjbPackage().getAssemblyDescriptor_MethodTransactions());
- helper.addAttribute(getEjbPackage().getMethodTransaction_TransactionAttribute(), aTransType);
- return helper;
- }
-
-
-
- protected static CommonPackage getCommonPackage() {
- return CommonPackage.eINSTANCE;
- }
-
- protected static EjbPackage getEjbPackage() {
- return EjbFactoryImpl.getPackage();
- }
-
- /**
- * Set the owner of
- *
- * @helper to be the existing AssemblyDescriptor from
- * @anEJBJar or set the ownerHelper of
- * @helper for the creation of a new AssemblyDescriptor when one does not exist.
- */
- public static void setAssemblyDescriptorOwnerHelper(ModifierHelper helper, EJBJar anEJBJar) {
- ModifierHelper ownerHelper = J2EEModifierHelperCreator.createAssemblyDescriptorHelper(anEJBJar);
- if (ownerHelper == null)
- helper.setOwner(anEJBJar.getAssemblyDescriptor());
- else
- helper.setOwnerHelper(ownerHelper);
- }
-
- /**
- * Set the owner of
- *
- * @helper to be the existing AssemblyDescriptor from
- * @anEJBJar or set the ownerHelper of
- * @helper for the creation of a new AssemblyDescriptor when one does not exist.
- */
- public static void setMethodPermissionOwnerHelper(ModifierHelper helper, SecurityRole role) {
- List roleList = new ArrayList(1);
- roleList.add(role);
- MethodPermission permission = ((AssemblyDescriptor) role.eContainer()).getMethodPermission(roleList);
- ModifierHelper ownerHelper = null;
- if (permission == null)
- ownerHelper = J2EEModifierHelperCreator.createMethodPermissionHelper(role);
-
- if (ownerHelper == null)
- helper.setOwner(permission);
- else
- helper.setOwnerHelper(ownerHelper);
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java
deleted file mode 100644
index dcd09de..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.common.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-
-public interface JARDependencyDataModelProperties {
-
- /**
- * String, the ear project name, required
- */
- public static final String EAR_PROJECT_NAME = "AbstractJARDependencyDataModel.EAR_PROJECT_NAME"; //$NON-NLS-1$
-
- public static final String REFERENCED_PROJECT_NAME = "AbstractJARDependencyDataModel.REFERENCED_PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * nested, required
- */
- public static final String PROJECT_NAME = UpdateManifestDataModelProperties.PROJECT_NAME;
-
-
- /**
- * Used for client JAR dependency inversion
- */
- public static final String OPPOSITE_PROJECT_NAME = "AbstractJARDependencyDataModel.OPPOSITE_PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * nested
- */
- public static final String JAR_LIST = UpdateManifestDataModelProperties.JAR_LIST;
-
- /**
- * type Integer, default JAR_MANIPULATION_ADD, other possible values are JAR_MANIPULATION_REMOVE
- * and JAR_MANIPULATION_INVERT
- */
- public static final String JAR_MANIPULATION_TYPE = "AbstractJARDependencyDataModel.JAR_MANIPULATION_TYPE"; //$NON-NLS-1$
-
- public static final String NESTED_MODEL_UPDATE_MAINFEST = "AbstractJARDependencyDataModel.NESTED_MODEL_UPDATE_MAINFEST"; //$NON-NLS-1$
-
- public static final int JAR_MANIPULATION_ADD = 0;
- public static final int JAR_MANIPULATION_REMOVE = 1;
- public static final int JAR_MANIPULATION_INVERT = 2;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java
deleted file mode 100644
index 17113d9..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java
+++ /dev/null
@@ -1,82 +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
- *******************************************************************************/
-/*
- * Created on Dec 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.common.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-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.datamodel.IDataModelOperation;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class JARDependencyDataModelProvider extends AbstractDataModelProvider implements JARDependencyDataModelProperties {
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EAR_PROJECT_NAME);
- propertyNames.add(REFERENCED_PROJECT_NAME);
- propertyNames.add(JAR_MANIPULATION_TYPE);
- propertyNames.add(OPPOSITE_PROJECT_NAME);
- return propertyNames;
- }
-
- public void init() {
- super.init();
- IDataModel updateManifestDataModel = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
- model.addNestedModel(NESTED_MODEL_UPDATE_MAINFEST, updateManifestDataModel);
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(JAR_MANIPULATION_TYPE)) {
- return new Integer(JAR_MANIPULATION_ADD);
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IProject getEARProject() {
- return ProjectUtilities.getProject(getStringProperty(EAR_PROJECT_NAME));
- }
-
- /**
- * @return
- */
- public IDataModel getUpdateManifestDataModel() {
- return model.getNestedModel(NESTED_MODEL_UPDATE_MAINFEST);
- }
-
- public IProject getReferencedProject() {
- return ProjectUtilities.getProject(getStringProperty(REFERENCED_PROJECT_NAME));
- }
-
- public IProject getOppositeProject() {
- return ProjectUtilities.getProject(getStringProperty(OPPOSITE_PROJECT_NAME));
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new JARDependencyOperation(model);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java
deleted file mode 100644
index a469cbc..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java
+++ /dev/null
@@ -1,206 +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
- *******************************************************************************/
-/*
- * Created on Sep 2, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.common.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class JARDependencyOperation extends AbstractDataModelOperation {
- public JARDependencyOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
-// private void saveModel(ClasspathModel model, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, CoreException {
-// if (!model.isDirty())
-// return;
-// validateEdit(model);
-// monitor.beginTask("", 2); //$NON-NLS-1$
-// org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestOperation mfOperation = createManifestOperation(model);
-// IHeadlessRunnableWithProgress buildPathOperation = createBuildPathOperation(model);
-// try {
-// mfOperation.execute(new SubProgressMonitor(monitor, 1), null);
-// buildPathOperation.run(new SubProgressMonitor(monitor, 1));
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-
- /**
- * @param model
- */
- protected void validateEdit(ClasspathModel aModel) throws CoreException {
- Set affectedFiles = aModel.getAffectedFiles();
- IFile[] files = (IFile[]) affectedFiles.toArray(new IFile[affectedFiles.size()]);
- IStatus result = J2EEPlugin.getWorkspace().validateEdit(files, null);
- if (!result.isOK())
- throw new CoreException(result);
- }
-
- protected UpdateJavaBuildPathOperation createBuildPathOperation(ClasspathModel aModel) {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(aModel.getProject());
- return new UpdateJavaBuildPathOperation(javaProject, aModel.getClassPathSelection());
- }
-
-// private UpdateManifestOperation createManifestOperation(ClasspathModel aModel) {
-// IDataModel updateManifestDataModel = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
-// updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, aModel.getProject().getName());
-// updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-// updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, UpdateManifestDataModelProvider.convertClasspathStringToList(aModel.getClassPathSelection().toString()));
-// return new UpdateManifestOperation(updateManifestDataModel);
-// }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.operations.HeadlessJ2EEOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
-// protected final void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-// JARDependencyDataModel dataModel = (JARDependencyDataModel) operationDataModel;
-// ClasspathModel model = new ClasspathModel(null);
-// model.setProject(dataModel.getProject());
-// //model.setSelectedEARNature(EARNatureRuntime.getRuntime(dataModel.getEARProject()));
-// try {
-// int jarManipulationType = dataModel.getIntProperty(JARDependencyDataModel.JAR_MANIPULATION_TYPE);
-// switch (jarManipulationType) {
-// case JARDependencyDataModel.JAR_MANIPULATION_ADD : {
-// List jarList = (List) dataModel.getUpdateManifestDataModel().getProperty(UpdateManifestDataModel.JAR_LIST);
-// if (!jarList.isEmpty()) {
-// for (int i = 0; i < jarList.size(); i++) {
-// String jarName = (String) jarList.get(i);
-// model.selectDependencyIfNecessary(jarName);
-// }
-// } else {
-// model.selectDependencyIfNecessary(dataModel.getReferencedProject());
-// }
-// }
-// break;
-// case JARDependencyDataModel.JAR_MANIPULATION_REMOVE : {
-// List jarList = (List) dataModel.getUpdateManifestDataModel().getProperty(UpdateManifestDataModel.JAR_LIST);
-// for (int i = 0; i < jarList.size(); i++) {
-// String jarName = (String) jarList.get(i);
-// model.removeDependency(jarName);
-// }
-// }
-// break;
-// case JARDependencyDataModel.JAR_MANIPULATION_INVERT :
-// ClassPathSelection classPathSelection = model.getClassPathSelection();
-// if (classPathSelection != null)
-// classPathSelection.invertClientJARSelection(dataModel.getReferencedProject(), dataModel.getOppositeProject());
-// break;
-// }
-// if (model.isDirty())
-// saveModel(model, monitor);
-// } finally {
-// if (model != null)
-// model.dispose();
-// if (monitor != null)
-// monitor.done();
-// }
-// }
-
- public final IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) throws ExecutionException {
-
- IProject proj = ProjectUtilities.getProject(model.getStringProperty(JARDependencyDataModelProperties.PROJECT_NAME));
- IProject refproj = ProjectUtilities.getProject(model.getStringProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME));
-
- try {
- int jarManipulationType = model.getIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE);
- switch (jarManipulationType) {
- case JARDependencyDataModelProperties.JAR_MANIPULATION_ADD :
- updateProjectDependency(proj, refproj, true);
- break;
- case JARDependencyDataModelProperties.JAR_MANIPULATION_REMOVE :
- updateProjectDependency(proj, refproj, false);
- break;
- case JARDependencyDataModelProperties.JAR_MANIPULATION_INVERT :
-
- break;
- }
- } finally {
- if (monitor != null)
- monitor.done();
- }
- return OK_STATUS;
- }
-
- private IClasspathEntry[] getProjectDependency(IProject clientProj){
- IClasspathEntry projectEntry = JavaCore.newProjectEntry(clientProj.getFullPath(), true);
- return new IClasspathEntry[]{projectEntry};
- }
-
- private void updateProjectDependency(final IProject ejbProj, final IProject clientProj, final boolean add){
-
- final IJavaProject javaProject = JavaCore.create( ejbProj );
- try {
- final IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- final IClasspathEntry[] entriesToChange = getProjectDependency( clientProj );
- final List classpathEntries = new ArrayList();
- for (int i = 0; i < oldEntries.length; i++) {
- if (!entryToChange(oldEntries[i], entriesToChange)) {
- classpathEntries.add(oldEntries[i]);
- }
- }
- if (add) {
- for( int j=0; j< entriesToChange.length; j++){
- classpathEntries.add(entriesToChange[j]);
- }
- }
- javaProject.setRawClasspath((IClasspathEntry[])classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]), null);
- }
- catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- private boolean entryToChange(final IClasspathEntry entry, final IClasspathEntry[] entriesToChange) {
- for (int i = 0; i < entriesToChange.length; i++) {
- if (entriesToChange[i].equals(entry)) {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java
deleted file mode 100644
index da2e94a..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java
+++ /dev/null
@@ -1,773 +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
- *******************************************************************************/
-/*
- * Created on Apr 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.common.operations;
-
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-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.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportContainer;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.compiler.CharOperation;
-
-//TODO this is a copy of the class in org.eclipse.jdt.ui and should be deleted once bugzilla 60567
-// is addressed
-/**
- *
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class JavaModelUtil {
- /**
- * Finds a type by its qualified type name (dot separated).
- *
- * @param jproject
- * The java project to search in
- * @param fullyQualifiedName
- * The fully qualified name (type name with enclosing type names and package (all
- * separated by dots))
- * @return The type found, or null if not existing
- */
- public static IType findType(IJavaProject jproject, String fullyQualifiedName) throws JavaModelException {
- //workaround for bug 22883
- IType type = jproject.findType(fullyQualifiedName);
- if (type != null)
- return type;
- IPackageFragmentRoot[] roots = jproject.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- type = findType(root, fullyQualifiedName);
- if (type != null && type.exists())
- return type;
- }
- return null;
- }
-
- /**
- * Returns <code>true</code> if the given package fragment root is referenced. This means it
- * is own by a different project but is referenced by the root's parent. Returns
- * <code>false</code> if the given root doesn't have an underlying resource.
- */
- public static boolean isReferenced(IPackageFragmentRoot root) {
- IResource resource = root.getResource();
- if (resource != null) {
- IProject jarProject = resource.getProject();
- IProject container = root.getJavaProject().getProject();
- return !container.equals(jarProject);
- }
- return false;
- }
-
- private static IType findType(IPackageFragmentRoot root, String fullyQualifiedName) throws JavaModelException {
- IJavaElement[] children = root.getChildren();
- for (int i = 0; i < children.length; i++) {
- IJavaElement element = children[i];
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- IPackageFragment pack = (IPackageFragment) element;
- if (!fullyQualifiedName.startsWith(pack.getElementName()))
- continue;
- IType type = findType(pack, fullyQualifiedName);
- if (type != null && type.exists())
- return type;
- }
- }
- return null;
- }
-
- private static IType findType(IPackageFragment pack, String fullyQualifiedName) throws JavaModelException {
- ICompilationUnit[] cus = pack.getCompilationUnits();
- for (int i = 0; i < cus.length; i++) {
- ICompilationUnit unit = cus[i];
- IType type = findType(unit, fullyQualifiedName);
- if (type != null && type.exists())
- return type;
- }
- return null;
- }
-
- private static IType findType(ICompilationUnit cu, String fullyQualifiedName) throws JavaModelException {
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- IType type = types[i];
- if (getFullyQualifiedName(type).equals(fullyQualifiedName))
- return type;
- }
- return null;
- }
-
- /**
- * Finds a type by package and type name.
- *
- * @param jproject
- * the java project to search in
- * @param pack
- * The package name
- * @param typeQualifiedName
- * the type qualified name (type name with enclosing type names (separated by dots))
- * @return the type found, or null if not existing
- * @deprecated Use IJavaProject.findType(String, String) instead
- */
- public static IType findType(IJavaProject jproject, String pack, String typeQualifiedName) throws JavaModelException {
- return jproject.findType(pack, typeQualifiedName);
- }
-
- /**
- * Finds a type container by container name. The returned element will be of type
- * <code>IType</code> or a <code>IPackageFragment</code>.<code>null</code> is returned
- * if the type container could not be found.
- *
- * @param jproject
- * The Java project defining the context to search
- * @param typeContainerName
- * A dot separarted name of the type container
- * @see #getTypeContainerName(IType)
- */
- public static IJavaElement findTypeContainer(IJavaProject jproject, String typeContainerName) throws JavaModelException {
- // try to find it as type
- IJavaElement result = jproject.findType(typeContainerName);
- if (result == null) {
- // find it as package
- IPath path = new Path(typeContainerName.replace('.', '/'));
- result = jproject.findElement(path);
- if (!(result instanceof IPackageFragment)) {
- result = null;
- }
-
- }
- return result;
- }
-
- /**
- * Finds a type in a compilation unit. Typical usage is to find the corresponding type in a
- * working copy.
- *
- * @param cu
- * the compilation unit to search in
- * @param typeQualifiedName
- * the type qualified name (type name with enclosing type names (separated by dots))
- * @return the type found, or null if not existing
- */
- public static IType findTypeInCompilationUnit(ICompilationUnit cu, String typeQualifiedName) throws JavaModelException {
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- String currName = getTypeQualifiedName(types[i]);
- if (typeQualifiedName.equals(currName)) {
- return types[i];
- }
- }
- return null;
- }
-
- /**
- * Finds a a member in a compilation unit. Typical usage is to find the corresponding member in
- * a working copy.
- *
- * @param cu
- * the compilation unit (eg. working copy) to search in
- * @param member
- * the member (eg. from the original)
- * @return the member found, or null if not existing
- */
- public static IMember findMemberInCompilationUnit(ICompilationUnit cu, IMember member) {
- IJavaElement[] elements = cu.findElements(member);
- if (elements != null && elements.length > 0) {
- return (IMember) elements[0];
- }
- return null;
- }
-
-
- /**
- * Returns the element of the given compilation unit which is "equal" to the given element. Note
- * that the given element usually has a parent different from the given compilation unit.
- *
- * @param cu
- * the cu to search in
- * @param element
- * the element to look for
- * @return an element of the given cu "equal" to the given element
- */
- public static IJavaElement findInCompilationUnit(ICompilationUnit cu, IJavaElement element) {
- IJavaElement[] elements = cu.findElements(element);
- if (elements != null && elements.length > 0) {
- return elements[0];
- }
- return null;
- }
-
- /**
- * Returns the qualified type name of the given type using '.' as separators. This is a replace
- * for IType.getTypeQualifiedName() which uses '$' as separators. As '$' is also a valid
- * character in an id this is ambiguous. JavaCore PR: 1GCFUNT
- */
- public static String getTypeQualifiedName(IType type) {
- return type.getTypeQualifiedName('.');
- }
-
- /**
- * Returns the fully qualified name of the given type using '.' as separators. This is a replace
- * for IType.getFullyQualifiedTypeName which uses '$' as separators. As '$' is also a valid
- * character in an id this is ambiguous. JavaCore PR: 1GCFUNT
- */
- public static String getFullyQualifiedName(IType type) {
- return type.getFullyQualifiedName('.');
- }
-
- /**
- * Returns the fully qualified name of a type's container. (package name or enclosing type name)
- */
- public static String getTypeContainerName(IType type) {
- IType outerType = type.getDeclaringType();
- if (outerType != null) {
- return outerType.getFullyQualifiedName('.');
- }
- return type.getPackageFragment().getElementName();
- }
-
-
- /**
- * Concatenates two names. Uses a dot for separation. Both strings can be empty or
- * <code>null</code>.
- */
- public static String concatenateName(String name1, String name2) {
- StringBuffer buf = new StringBuffer();
- if (name1 != null && name1.length() > 0) {
- buf.append(name1);
- }
- if (name2 != null && name2.length() > 0) {
- if (buf.length() > 0) {
- buf.append('.');
- }
- buf.append(name2);
- }
- return buf.toString();
- }
-
- /**
- * Concatenates two names. Uses a dot for separation. Both strings can be empty or
- * <code>null</code>.
- */
- public static String concatenateName(char[] name1, char[] name2) {
- StringBuffer buf = new StringBuffer();
- if (name1 != null && name1.length > 0) {
- buf.append(name1);
- }
- if (name2 != null && name2.length > 0) {
- if (buf.length() > 0) {
- buf.append('.');
- }
- buf.append(name2);
- }
- return buf.toString();
- }
-
- /**
- * Evaluates if a member (possible from another package) is visible from elements in a package.
- *
- * @param member
- * The member to test the visibility for
- * @param pack
- * The package in focus
- */
- public static boolean isVisible(IMember member, IPackageFragment pack) throws JavaModelException {
-
- int type = member.getElementType();
- if (type == IJavaElement.INITIALIZER || (type == IJavaElement.METHOD && member.getElementName().startsWith("<"))) { //$NON-NLS-1$
- return false;
- }
-
- int otherflags = member.getFlags();
- IType declaringType = member.getDeclaringType();
- if (Flags.isPublic(otherflags) || (declaringType != null && declaringType.isInterface())) {
- return true;
- } else if (Flags.isPrivate(otherflags)) {
- return false;
- }
-
- IPackageFragment otherpack = (IPackageFragment) findParentOfKind(member, IJavaElement.PACKAGE_FRAGMENT);
- return (pack != null && otherpack != null && isSamePackage(pack, otherpack));
- }
-
- /**
- * Evaluates if a member in the focus' element hierarchy is visible from elements in a package.
- *
- * @param member
- * The member to test the visibility for
- * @param pack
- * The package of the focus element focus
- */
- public static boolean isVisibleInHierarchy(IMember member, IPackageFragment pack) throws JavaModelException {
- int type = member.getElementType();
- if (type == IJavaElement.INITIALIZER || (type == IJavaElement.METHOD && member.getElementName().startsWith("<"))) { //$NON-NLS-1$
- return false;
- }
-
- int otherflags = member.getFlags();
-
- IType declaringType = member.getDeclaringType();
- if (Flags.isPublic(otherflags) || Flags.isProtected(otherflags) || (declaringType != null && declaringType.isInterface())) {
- return true;
- } else if (Flags.isPrivate(otherflags)) {
- return false;
- }
-
- IPackageFragment otherpack = (IPackageFragment) findParentOfKind(member, IJavaElement.PACKAGE_FRAGMENT);
- return (pack != null && pack.equals(otherpack));
- }
-
-
- /**
- * Returns the package fragment root of <code>IJavaElement</code>. If the given element is
- * already a package fragment root, the element itself is returned.
- */
- public static IPackageFragmentRoot getPackageFragmentRoot(IJavaElement element) {
- return (IPackageFragmentRoot) element.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
- }
-
- /**
- * Returns the parent of the supplied java element that conforms to the given parent type or
- * <code>null</code>, if such a parent doesn't exit.
- *
- * @deprecated Use element.getParent().getAncestor(kind);
- */
- public static IJavaElement findParentOfKind(IJavaElement element, int kind) {
- if (element != null && element.getParent() != null) {
- return element.getParent().getAncestor(kind);
- }
- return null;
- }
-
- /**
- * Finds a method in a type. This searches for a method with the same name and signature.
- * Parameter types are only compared by the simple name, no resolving for the fully qualified
- * type name is done. Constructors are only compared by parameters, not the name.
- *
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first found method or <code>null</code>, if nothing found
- */
- public static IMethod findMethod(String name, String[] paramTypes, boolean isConstructor, IType type) throws JavaModelException {
- return findMethod(name, paramTypes, isConstructor, type.getMethods());
- }
-
- /**
- * Finds a method by name. This searches for a method with a name and signature. Parameter types
- * are only compared by the simple name, no resolving for the fully qualified type name is done.
- * Constructors are only compared by parameters, not the name.
- *
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @param methods
- * The methods to search in
- * @return The found method or <code>null</code>, if nothing found
- */
- public static IMethod findMethod(String name, String[] paramTypes, boolean isConstructor, IMethod[] methods) throws JavaModelException {
- for (int i = methods.length - 1; i >= 0; i--) {
- if (isSameMethodSignature(name, paramTypes, isConstructor, methods[i])) {
- return methods[i];
- }
- }
- return null;
- }
-
-
- /**
- * Finds a method declararion in a type's hierarchy. The search is top down, so this returns the
- * first declaration of the method in the hierarchy. This searches for a method with a name and
- * signature. Parameter types are only compared by the simple name, no resolving for the fully
- * qualified type name is done. Constructors are only compared by parameters, not the name.
- *
- * @param type
- * Searches in this type's supertypes.
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first method found or null, if nothing found
- */
- public static IMethod findMethodDeclarationInHierarchy(ITypeHierarchy hierarchy, IType type, String name, String[] paramTypes, boolean isConstructor) throws JavaModelException {
- IType[] superTypes = hierarchy.getAllSupertypes(type);
- for (int i = superTypes.length - 1; i >= 0; i--) {
- IMethod first = findMethod(name, paramTypes, isConstructor, superTypes[i]);
- if (first != null && !Flags.isPrivate(first.getFlags())) {
- // the order getAllSupertypes does make assumptions of the order of inner elements
- // -> search recursivly
- IMethod res = findMethodDeclarationInHierarchy(hierarchy, first.getDeclaringType(), name, paramTypes, isConstructor);
- if (res != null) {
- return res;
- }
- return first;
- }
- }
- return null;
- }
-
- /**
- * Finds a method implementation in a type's classhierarchy. The search is bottom-up, so this
- * returns the nearest overridden method. Does not find methods in interfaces or abstract
- * methods. This searches for a method with a name and signature. Parameter types are only
- * compared by the simple name, no resolving for the fully qualified type name is done.
- * Constructors are only compared by parameters, not the name.
- *
- * @param type
- * Type to search the superclasses
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first method found or null, if nothing found
- */
- public static IMethod findMethodImplementationInHierarchy(ITypeHierarchy hierarchy, IType type, String name, String[] paramTypes, boolean isConstructor) throws JavaModelException {
- IType[] superTypes = hierarchy.getAllSuperclasses(type);
- for (int i = 0; i < superTypes.length; i++) {
- IMethod found = findMethod(name, paramTypes, isConstructor, superTypes[i]);
- if (found != null) {
- if (Flags.isAbstract(found.getFlags())) {
- return null;
- }
- return found;
- }
- }
- return null;
- }
-
- /**
- * Tests if a method equals to the given signature. Parameter types are only compared by the
- * simple name, no resolving for the fully qualified type name is done. Constructors are only
- * compared by parameters, not the name.
- *
- * @param name
- * Name of the method
- * @param paramTypes
- * The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
- * @param isConstructor
- * Specifies if the method is a constructor
- * @return Returns <code>true</code> if the method has the given name and parameter types and
- * constructor state.
- */
- public static boolean isSameMethodSignature(String name, String[] paramTypes, boolean isConstructor, IMethod curr) throws JavaModelException {
- if (isConstructor || name.equals(curr.getElementName())) {
- if (isConstructor == curr.isConstructor()) {
- String[] currParamTypes = curr.getParameterTypes();
- if (paramTypes.length == currParamTypes.length) {
- for (int i = 0; i < paramTypes.length; i++) {
- String t1 = Signature.getSimpleName(Signature.toString(paramTypes[i]));
- String t2 = Signature.getSimpleName(Signature.toString(currParamTypes[i]));
- if (!t1.equals(t2)) {
- return false;
- }
- }
- return true;
- }
- }
- }
- return false;
- }
-
-
- /**
- * Tests if two <code>IPackageFragment</code> s represent the same logical java package.
- *
- * @return <code>true</code> if the package fragments' names are equal.
- */
- public static boolean isSamePackage(IPackageFragment pack1, IPackageFragment pack2) {
- return pack1.getElementName().equals(pack2.getElementName());
- }
-
- /**
- * Checks whether the given type has a valid main method or not.
- */
- public static boolean hasMainMethod(IType type) throws JavaModelException {
- IMethod[] methods = type.getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isMainMethod()) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Checks if the field is boolean.
- */
- public static boolean isBoolean(IField field) throws JavaModelException {
- return field.getTypeSignature().equals(Signature.SIG_BOOLEAN);
- }
-
- /**
- * Returns true if the element is on the build path of the given project
- *
- * @deprecated Use jproject.isOnClasspath(element);
- */
- public static boolean isOnBuildPath(IJavaProject jproject, IJavaElement element) {
- return jproject.isOnClasspath(element);
- }
-
- /**
- * Tests if the given element is on the class path of its containing project. Handles the case
- * that the containing project isn't a Java project.
- */
- public static boolean isOnClasspath(IJavaElement element) {
- IJavaProject project = element.getJavaProject();
- if (!project.exists())
- return false;
- return project.isOnClasspath(element);
- }
-
- /**
- * Resolves a type name in the context of the declaring type.
- *
- * @param refTypeSig
- * the type name in signature notation (for example 'QVector') this can also be an
- * array type, but dimensions will be ignored.
- * @param declaringType
- * the context for resolving (type where the reference was made in)
- * @return returns the fully qualified type name or build-in-type name. if a unresoved type
- * couldn't be resolved null is returned
- */
- public static String getResolvedTypeName(String refTypeSig, IType declaringType) throws JavaModelException {
- int arrayCount = Signature.getArrayCount(refTypeSig);
- char type = refTypeSig.charAt(arrayCount);
- if (type == Signature.C_UNRESOLVED) {
- int semi = refTypeSig.indexOf(Signature.C_SEMICOLON, arrayCount + 1);
- if (semi == -1) {
- throw new IllegalArgumentException();
- }
- String name = refTypeSig.substring(arrayCount + 1, semi);
-
- String[][] resolvedNames = declaringType.resolveType(name);
- if (resolvedNames != null && resolvedNames.length > 0) {
- return concatenateName(resolvedNames[0][0], resolvedNames[0][1]);
- }
- return null;
- }
- return Signature.toString(refTypeSig.substring(arrayCount));
- }
-
- /**
- * Returns if a CU can be edited.
- */
- public static boolean isEditable(ICompilationUnit cu) {
- IResource resource = toOriginal(cu).getResource();
- return (resource.exists() && !resource.isReadOnly());
- }
-
- /**
- * Finds a qualified import for a type name.
- */
- public static IImportDeclaration findImport(ICompilationUnit cu, String simpleName) throws JavaModelException {
- IImportDeclaration[] existing = cu.getImports();
- for (int i = 0; i < existing.length; i++) {
- String curr = existing[i].getElementName();
- if (curr.endsWith(simpleName)) {
- int dotPos = curr.length() - simpleName.length() - 1;
- if ((dotPos == -1) || (dotPos > 0 && curr.charAt(dotPos) == '.')) {
- return existing[i];
- }
- }
- }
- return null;
- }
-
- //private static boolean PRIMARY_ONLY = false;
-
-
-
- /**
- * Returns the original element if the given element is a working copy. If the cu is already an
- * original the input element is returned. The returned element might not exist
- */
- public static IJavaElement toOriginal(IJavaElement element) {
- return element.getPrimaryElement();
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IMember toWorkingCopy(IMember member) {
- return member;
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IPackageDeclaration toWorkingCopy(IPackageDeclaration declaration) {
- return declaration;
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IJavaElement toWorkingCopy(IJavaElement elem) {
- return elem;
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IImportContainer toWorkingCopy(IImportContainer container) {
- return container;
-
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IImportDeclaration toWorkingCopy(IImportDeclaration importDeclaration) {
- return importDeclaration;
- }
-
-
- /**
- * @deprecated Inline this method.
- */
- public static ICompilationUnit toWorkingCopy(ICompilationUnit cu) {
- return cu;
- }
-
- /**
- * Returns true if a cu is a primary cu (original or shared working copy)
- */
- public static boolean isPrimary(ICompilationUnit cu) {
- return cu.getOwner() == null;
- }
-
-
- /*
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
- *
- * Reconciling happens in a separate thread. This can cause a situation where the Java element
- * gets disposed after an exists test has been done. So we should not log not present exceptions
- * when they happen in working copies.
- */
- public static boolean filterNotPresentException(CoreException exception) {
- if (!(exception instanceof JavaModelException))
- return true;
- JavaModelException je = (JavaModelException) exception;
- if (!je.isDoesNotExist())
- return true;
- IJavaElement[] elements = je.getJavaModelStatus().getElements();
- for (int i = 0; i < elements.length; i++) {
- IJavaElement element = elements[i];
- ICompilationUnit unit = (ICompilationUnit) element.getAncestor(IJavaElement.COMPILATION_UNIT);
- if (unit == null)
- return true;
- if (!unit.isWorkingCopy())
- return true;
- }
- return false;
- }
-
- public static IType[] getAllSuperTypes(IType type, IProgressMonitor pm) throws JavaModelException {
- //workaround for 23656
- Set types = new HashSet(Arrays.asList(type.newSupertypeHierarchy(pm).getAllSupertypes(type)));
- IType objekt = type.getJavaProject().findType("java.lang.Object");//$NON-NLS-1$
- if (objekt != null)
- types.add(objekt);
- return (IType[]) types.toArray(new IType[types.size()]);
- }
-
- public static boolean isExcludedPath(IPath resourcePath, IPath[] exclusionPatterns) {
- char[] path = resourcePath.toString().toCharArray();
- for (int i = 0, length = exclusionPatterns.length; i < length; i++) {
- char[] pattern = exclusionPatterns[i].toString().toCharArray();
- if (CharOperation.pathMatch(pattern, path, true, '/')) {
- return true;
- }
- }
- return false;
- }
-
-
- /*
- * Returns whether the given resource path matches one of the exclusion patterns.
- *
- * @see IClasspathEntry#getExclusionPatterns
- */
- public final static boolean isExcluded(IPath resourcePath, char[][] exclusionPatterns) {
- if (exclusionPatterns == null)
- return false;
- char[] path = resourcePath.toString().toCharArray();
- for (int i = 0, length = exclusionPatterns.length; i < length; i++)
- if (CharOperation.pathMatch(exclusionPatterns[i], path, true, '/'))
- return true;
- return false;
- }
-
-
- /**
- * Force a reconcile of a compilation unit.
- *
- * @param unit
- */
- public static void reconcile(ICompilationUnit unit) throws JavaModelException {
- synchronized (unit) {
- unit.reconcile();
- }
- }
-
- private static Boolean fgIsJDTCore_1_5 = null;
-
- /**
- * Return true if JRE 1.5 in enabled.
- */
- public static boolean isJDTCore_1_5() {
- if (fgIsJDTCore_1_5 == null) {
- fgIsJDTCore_1_5 = new Boolean(JavaCore.getDefaultOptions().containsKey("org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation")); //$NON-NLS-1$
- }
- return fgIsJDTCore_1_5.booleanValue();
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java
deleted file mode 100644
index cd2cf31..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java
+++ /dev/null
@@ -1,505 +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.jst.j2ee.internal.common.operations;
-
-import java.lang.reflect.Modifier;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFolder;
-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.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditOperationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * This data model provider is a subclass of AbstractDataModelProvider and follows the
- * IDataModelOperation and Data Model Wizard frameworks.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider
- *
- * This data model provider extends the ArtifactEditOperationDataModelProvider to get project name
- * and artifact edit information that during the operation, the artifact edit model can be used to
- * save changes.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditOperationDataModelProvider
- *
- * The NewJavaClassDataModelProvider is used to store all the base properties which would be needed
- * to generate a new instance of a java class. Validations for these properties such as class name,
- * package name, superclass, and modifiers are also provided.
- *
- * The INewJavaClassDataModelProperties is implemented to store all of the property names.
- * @see org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties
- *
- * Clients must subclass this data model provider and the properties interface to use it and to
- * cache and provide their own specific attributes. They should also provide their own validation
- * methods and default values for the properties they add.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewJavaClassDataModelProvider extends ArtifactEditOperationDataModelProvider implements INewJavaClassDataModelProperties {
-
- /**
- * Subclasses may extend this method to perform their own validation. This method should not
- * return null. It does not accept null as a parameter.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param folderFullPath
- * @return IStatus
- */
- protected IStatus validateJavaSourceFolder(String folderFullPath) {
- // Ensure that the source folder path is not empty
- if (folderFullPath == null || folderFullPath.length() == 0) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Ensure that the source folder path is absolute
- else if (!new Path(folderFullPath).isAbsolute()) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_ABSOLUTE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- IProject project = getTargetProject();
- // Ensure project is not closed
- if (project == null) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_EXIST;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Ensure project is accessible.
- if (!project.isAccessible()) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_EXIST;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Ensure the project is a java project.
- try {
- if (!project.hasNature(JavaCore.NATURE_ID)) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NOT_JAVA_PROJECT;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- }
- // Ensure the selected folder is a valid java source folder for the component
- IFolder sourcefolder = getJavaSourceFolder();
- if (sourcefolder == null || (sourcefolder != null && !sourcefolder.getFullPath().equals(new Path(folderFullPath)))) {
- String msg = J2EECommonMessages.getResourceString(J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_SOURCE, new String[]{folderFullPath});
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Valid source is selected
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * Subclasses may extend this method to perform their own retrieval of a default java source
- * folder. This implementation returns the first source folder in the project for the component.
- * This method may return null.
- *
- * @return IFolder instance of default java source folder
- */
- protected IFolder getDefaultJavaSourceFolder() {
- IProject project = getTargetProject();
- if (project == null)
- return null;
- IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(project);
- // Try and return the first source folder
- if (sources.length > 0) {
- try {
- return (IFolder) sources[0].getCorrespondingResource();
- } catch (Exception e) {
- return null;
- }
- }
- return null;
- }
-
- /**
- * Subclasses may extend this method to create their own specialized default WTP operation. This
- * implementation creates an instance of the NewJavaClassOperation to create a new java class.
- * This method will not return null.
- *
- * @see WTPOperationDataModel#getDefaultOperation()
- * @see NewJavaClassOperation
- *
- * @return WTPOperation
- */
- public IDataModelOperation getDefaultOperation() {
- return new NewJavaClassOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(SOURCE_FOLDER);
- propertyNames.add(JAVA_PACKAGE);
- propertyNames.add(CLASS_NAME);
- propertyNames.add(SUPERCLASS);
- propertyNames.add(MODIFIER_PUBLIC);
- propertyNames.add(MODIFIER_ABSTRACT);
- propertyNames.add(MODIFIER_FINAL);
- propertyNames.add(INTERFACES);
- propertyNames.add(MAIN_METHOD);
- propertyNames.add(CONSTRUCTOR);
- propertyNames.add(ABSTRACT_METHODS);
- propertyNames.add(JAVA_PACKAGE_FRAGMENT_ROOT);
- propertyNames.add(JAVA_SOURCE_FOLDER);
- propertyNames.add(PROJECT);
- propertyNames.add(QUALIFIED_CLASS_NAME);
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to add the default values for their own specific data model
- * properties. This declares the default values for the new java class. This method does not
- * accept null. It may return null.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return default object value of the property
- */
- public Object getDefaultProperty(String propertyName) {
- // Get the default source folder for the project
- if (propertyName.equals(SOURCE_FOLDER)) {
- IFolder sourceFolder = getDefaultJavaSourceFolder();
- if (sourceFolder != null && sourceFolder.exists())
- return sourceFolder.getFullPath().toOSString();
- }
- // Use Object as the default superclass if one is not specified
- else if (propertyName.equals(SUPERCLASS))
- return new String("java.lang.Object"); //$NON-NLS-1$
- // Use public as default visibility
- else if (propertyName.equals(MODIFIER_PUBLIC))
- return new Boolean(true);
- // Generate constructors from the superclass by default
- else if (propertyName.equals(CONSTRUCTOR))
- return new Boolean(true);
- // Generate unimplemented methods from declared interfaces by default
- else if (propertyName.equals(ABSTRACT_METHODS))
- return new Boolean(true);
- else if (propertyName.equals(PROJECT))
- return getTargetProject();
- else if (propertyName.equals(JAVA_SOURCE_FOLDER))
- return getJavaSourceFolder();
- else if (propertyName.equals(JAVA_PACKAGE_FRAGMENT_ROOT))
- return getJavaPackageFragmentRoot();
- else if (propertyName.equals(QUALIFIED_CLASS_NAME))
- return getQualifiedClassName();
- return super.getDefaultProperty(propertyName);
- }
-
- /**
- * This method will return the qualified java class name as specified by the class name and
- * package name properties in the data model. This method should not return null.
- *
- * @see INewJavaClassDataModelProperties#CLASS_NAME
- * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
- *
- * @return String qualified java classname
- */
- private String getQualifiedClassName() {
- // Use the java package name and unqualified class name to create a qualified java class
- // name
- String packageName = getStringProperty(JAVA_PACKAGE);
- String className = getStringProperty(CLASS_NAME);
- // Ensure the class is not in the default package before adding package name to qualified
- // name
- if (packageName != null && packageName.trim().length() > 0)
- return packageName + "." + className; //$NON-NLS-1$
- return className;
- }
-
- /**
- * Subclasses may override this method to provide their own validation of any of the data
- * model's properties. This implementation ensures that a java class can be properly generated
- * from the values as specified. This method will not return null. This method will not accept
- * null as a parameter.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#validate(java.lang.String)
- *
- * @param propertyName
- * @return IStatus of the validity of the specifiec property
- */
- public IStatus validate(String propertyName) {
- IStatus result = super.validate(propertyName);
- if (result != null && !result.isOK())
- return result;
- if (propertyName.equals(SOURCE_FOLDER))
- return validateJavaSourceFolder(getStringProperty(propertyName));
- if (propertyName.equals(JAVA_PACKAGE))
- return validateJavaPackage(getStringProperty(propertyName));
- if (propertyName.equals(CLASS_NAME)) {
- result = validateJavaClassName(getStringProperty(propertyName));
- if (result.isOK())
- result = canCreateTypeInClasspath(getStringProperty(CLASS_NAME));
- }
- if (propertyName.equals(SUPERCLASS))
- return validateSuperclass(getStringProperty(propertyName));
- if (propertyName.equals(MODIFIER_ABSTRACT) || propertyName.equals(MODIFIER_FINAL))
- return validateModifier(propertyName, getBooleanProperty(propertyName));
- return result;
- }
-
- /**
- * This method will validate whether the specified package name is a valid java package name. It
- * will be called during the doValidateProperty(String). This method will accept null. It will
- * not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param packName --
- * the package name
- * @return IStatus of if the package name is valid
- */
- private IStatus validateJavaPackage(String packName) {
- if (packName != null && packName.trim().length() > 0) {
- // Use standard java conventions to validate the package name
- IStatus javaStatus = JavaConventions.validatePackageName(packName);
- if (javaStatus.getSeverity() == IStatus.ERROR) {
- String msg = J2EECommonMessages.ERR_JAVA_PACAKGE_NAME_INVALID + javaStatus.getMessage();
- return WTPCommonPlugin.createErrorStatus(msg);
- } else if (javaStatus.getSeverity() == IStatus.WARNING) {
- String msg = J2EECommonMessages.ERR_JAVA_PACKAGE_NAME_WARNING + javaStatus.getMessage();
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- // java package name is valid
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * Subclasses may override this method to provide their own validation of the class name. This
- * implementation will verify if the specified class name is a valid UNQUALIFIED java class
- * name. This method will not accept null. It will not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param className
- * @return IStatus of if java class name is valid
- */
- protected IStatus validateJavaClassName(String className) {
- // Do not allow qualified name
- if (className.lastIndexOf('.') != -1) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_QUALIFIED;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Check Java class name by standard java conventions
- IStatus javaStatus = JavaConventions.validateJavaTypeName(className);
- if (javaStatus.getSeverity() == IStatus.ERROR) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_INVALID + javaStatus.getMessage();
- return WTPCommonPlugin.createErrorStatus(msg);
- } else if (javaStatus.getSeverity() == IStatus.WARNING) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_WARNING + javaStatus.getMessage();
- return WTPCommonPlugin.createWarningStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This method will verify the specified superclass can be subclassed. It ensures the superclass
- * is a valid java class, that it exists, and that it is not final. This method will accept
- * null. It will not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param superclassName
- * @return IStatus of if the superclass can be subclassed
- */
- private IStatus validateSuperclass(String superclassName) {
- // Ensure the superclass name is not empty
- if (superclassName == null || superclassName.trim().length() == 0) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // In default case of Object, return OK right away
- if (superclassName.equals("java.lang.Object")) //$NON-NLS-1$
- return WTPCommonPlugin.OK_STATUS;
- // Ensure the unqualified java class name of the superclass is valid
- String className = superclassName;
- int index = superclassName.lastIndexOf("."); //$NON-NLS-1$
- if (index != -1) {
- className = superclassName.substring(index + 1);
- }
- IStatus status = validateJavaClassName(className);
- // If unqualified super class name is valid, ensure validity of superclass itself
- if (status.isOK()) {
- // If the superclass does not exist, throw an error
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(getTargetProject());
- IType supertype = null;
- try {
- supertype = javaProject.findType(superclassName);
- } catch (Exception e) {
- // Just throw error below
- }
- if (supertype == null) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_SUPERCLASS_NOT_EXIST;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Ensure the superclass is not final
- int flags = -1;
- try {
- flags = supertype.getFlags();
- if (Modifier.isFinal(flags)) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_SUPERCLASS_FINAL;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- }
- // Return status of specified superclass
- return status;
- }
-
- /**
- * This method will ensure that if the abstract modifier is set, that final is not set, and
- * vice-versa, as this is not supported either way. This method will not accept null. It will
- * not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus of whether abstract value is valid
- */
- private IStatus validateModifier(String propertyName, boolean prop) {
- // Throw an error if both Abstract and Final are checked
- if (prop) {
- // Ensure final is not also checked
- if (propertyName.equals(MODIFIER_ABSTRACT) && getBooleanProperty(MODIFIER_FINAL)) {
- String msg = J2EECommonMessages.ERR_BOTH_FINAL_AND_ABSTRACT;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Ensure abstract is not also checked
- if (propertyName.equals(MODIFIER_FINAL) && getBooleanProperty(MODIFIER_ABSTRACT)) {
- String msg = J2EECommonMessages.ERR_BOTH_FINAL_AND_ABSTRACT;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- // Abstract and final settings are valid
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This method is intended for internal use only. This will check the java model for the
- * specified javaproject in the data model for the existence of the passed in qualified
- * classname. This method does not accept null. It may return null.
- *
- * @see NewJavaClassDataModelProvider#getTargetProject()
- * @see JavaModelUtil#findType(IJavaProject, String)
- *
- * @param fullClassName
- * @return IType for the specified classname
- */
- protected IStatus canCreateTypeInClasspath(String className) {
- // Retrieve the java project for the cached project
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(getTargetProject());
- try {
- IPath path = new Path(getStringProperty(SOURCE_FOLDER) + "//" + getStringProperty(JAVA_PACKAGE)); //$NON-NLS-1$
- IPackageFragment pack = javaProject.findPackageFragment(path);
- if (pack != null) {
- ICompilationUnit cu = pack.getCompilationUnit(className + ".java"); //$NON-NLS-1$
- IResource resource = cu.getResource();
- if (resource.exists()) {
- String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_EXIST;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- return WTPCommonPlugin.OK_STATUS;
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This will return the IFolder instance for the specified folder name in the data model. This
- * method may return null.
- *
- * @see INewJavaClassDataModelProperties#SOURCE_FOLDER
- * @see NewJavaClassDataModelProvider#getAllSourceFolders()
- *
- * @return IFolder java source folder
- */
- protected final IFolder getJavaSourceFolder() {
- IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(getTargetProject());
- // Ensure there is valid source folder(s)
- if (sources == null || sources.length == 0)
- return null;
- String folderFullPath = getStringProperty(SOURCE_FOLDER);
- // Get the source folder whose path matches the source folder name value in the data model
- for (int i = 0; i < sources.length; i++) {
- if (sources[i].getPath().equals(new Path(folderFullPath))) {
- try {
- return (IFolder) sources[i].getCorrespondingResource();
- } catch (Exception e) {
- break;
- }
- }
- }
- return null;
- }
-
- /**
- * Subclasses may extend this method to perform their own retrieval mechanism. This
- * implementation simply returns the JDT package fragment root for the selected source folder.
- * This method may return null.
- *
- * @see IJavaProject#getPackageFragmentRoot(org.eclipse.core.resources.IResource)
- *
- * @return IPackageFragmentRoot
- */
- protected IPackageFragmentRoot getJavaPackageFragmentRoot() {
- IProject project = getTargetProject();
- IJavaProject aJavaProject = JemProjectUtilities.getJavaProject(project);
- // Return the source folder for the java project of the selected project
- if (aJavaProject != null) {
- IFolder sourcefolder = (IFolder) getProperty(JAVA_SOURCE_FOLDER);
- if (sourcefolder != null)
- return aJavaProject.getPackageFragmentRoot(sourcefolder);
- }
- return null;
- }
-
- /**
- * This method ensures the source folder is updated if the component is changed.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
- * Object)
- *
- * @return boolean if property set successfully
- */
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean result = super.propertySet(propertyName, propertyValue);
- if (result) {
- if (COMPONENT_NAME.equals(propertyName))
- setProperty(SOURCE_FOLDER, getDefaultJavaSourceFolder().getFullPath().toOSString());
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java
deleted file mode 100644
index d896714..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java
+++ /dev/null
@@ -1,821 +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.jst.j2ee.internal.common.operations;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * NewJavaClassOperation is a data model operation that is used to create a default instance of a new java class
- * based on the input and properties set in the NewJavaClassDataModelProvider.
- * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider
- *
- * It is a subclass of ArtifactEditProviderOperation and clients can invoke this operation as is or it may be subclassed to
- * add additional or modify behaviour. The execute() method can be extended to drive this behaviour.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * The new java class is generated through the use of adding a series of static tokens defined within to
- * an ongoing string buffer.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- *
- * This needs to be removed as it is legacy inherited from another team
- */
-public class NewJavaClassOperation extends ArtifactEditProviderOperation {
-
- // Tokens for string buffer creation of default java class
- protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
- protected static final String TAB = "\t"; //$NON-NLS-1$
- protected static final String SPACE = " "; //$NON-NLS-1$
- protected static final String DOT = "."; //$NON-NLS-1$
- protected static final String COMMA = ","; //$NON-NLS-1$
- protected static final String SEMICOLON = ";"; //$NON-NLS-1$
- protected static final String POUND = "#"; //$NON-NLS-1$
- protected static final String OPEN_PAR = "("; //$NON-NLS-1$
- protected static final String CLOSE_PAR = ")"; //$NON-NLS-1$
- protected static final String OPEN_BRA = "{"; //$NON-NLS-1$
- protected static final String CLOSE_BRA = "}"; //$NON-NLS-1$
- protected static final String lineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$
-
- protected static final String JAVA_LANG_OBJECT = "java.lang.Object"; //$NON-NLS-1$
- protected static final String PACKAGE = "package "; //$NON-NLS-1$
- protected static final String CLASS = "class "; //$NON-NLS-1$
- protected static final String IMPORT = "import "; //$NON-NLS-1$
- protected static final String EXTENDS = "extends "; //$NON-NLS-1$
- protected static final String IMPLEMENTS = "implements "; //$NON-NLS-1$
- protected static final String THROWS = "throws "; //$NON-NLS-1$
- protected static final String SUPER = "super"; //$NON-NLS-1$
- protected static final String PUBLIC = "public "; //$NON-NLS-1$
- protected static final String PROTECTED = "protected "; //$NON-NLS-1$
- protected static final String PRIVATE = "private "; //$NON-NLS-1$
- protected static final String STATIC = "static "; //$NON-NLS-1$
- protected static final String ABSTRACT = "abstract "; //$NON-NLS-1$
- protected static final String FINAL = "final "; //$NON-NLS-1$
- protected static final String VOID = "void"; //$NON-NLS-1$
- protected static final String INT = "int"; //$NON-NLS-1$
- protected static final String BOOLEAN = "boolean"; //$NON-NLS-1$
- protected static final String MAIN_METHOD = "\tpublic static void main(String[] args) {"; //$NON-NLS-1$
- protected static final String TODO_COMMENT = "\t\t// TODO Auto-generated method stub"; //$NON-NLS-1$
- protected static final String RETURN_NULL = "\t\treturn null;"; //$NON-NLS-1$
- protected static final String RETURN_0 = "\t\treturn 0;"; //$NON-NLS-1$
- protected static final String RETURN_FALSE = "\t\treturn false;"; //$NON-NLS-1$
-
- /**
- * This is a list of all the calculated import statements that will need to be added
- */
- private List importStatements;
-
- /**
- * This is a NewJavaClassOperation constructor. Data models passed in should be instances
- * of NewJavaClassDataModel. This method does not accept null. It will not return null.
- * @see NewJavaClassDataModelProvider
- *
- * @param dataModel
- * @return NewJavaClassOperation
- */
- public NewJavaClassOperation(IDataModel dataModel) {
- super(dataModel);
- importStatements = new ArrayList();
- }
-
- /**
- * Subclasses may extend this method to add their own actions during execution.
- * The implementation of the execute method drives the running of the operation. This
- * method will create the source folder, the java package, and then create the java file.
- * This method will accept null.
- * @see AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- *
- * @param monitor ProgressMonitor
- * @throws CoreException
- * @throws InterruptedException
- * @throws InvocationTargetException
- */
- public IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // Ensure source folder exists
- IFolder sourceFolder = createJavaSourceFolder();
- // Ensure java package exists
- IPackageFragment pack = createJavaPackage();
- // Create java class
- createJavaFile(sourceFolder, pack);
- return OK_STATUS;
- }
-
- /**
- * This method will return the java source folder as specified in the java class data model.
- * It will create the java source folder if it does not exist. This method may return null.
- * @see INewJavaClassDataModelProperties#SOURCE_FOLDER
- * @see IFolder#create(boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
- *
- * @return IFolder the java source folder
- */
- protected final IFolder createJavaSourceFolder() {
- // Get the source folder name from the data model
- String folderFullPath = model.getStringProperty(INewJavaClassDataModelProperties.SOURCE_FOLDER);
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IFolder folder = root.getFolder(new Path(folderFullPath));
- // If folder does not exist, create the folder with the specified path
- if (!folder.exists()) {
- try {
- folder.create(true, true, null);
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- }
- }
- // Return the source folder
- return folder;
- }
-
- /**
- * This method will return the java package as specified by the new java class data model.
- * If the package does not exist, it will create the package. This method should not return
- * null.
- * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
- * @see IPackageFragmentRoot#createPackageFragment(java.lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor)
- *
- * @return IPackageFragment the java package
- */
- protected final IPackageFragment createJavaPackage() {
- // Retrieve the package name from the java class data model
- String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
- IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
- IPackageFragment pack = packRoot.getPackageFragment(packageName);
- // Handle default package
- if (pack == null) {
- pack = packRoot.getPackageFragment(""); //$NON-NLS-1$
- }
- // Create the package fragment if it does not exist
- if (!pack.exists()) {
- String packName = pack.getElementName();
- try {
- pack = packRoot.createPackageFragment(packName, true, null);
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- }
- // Return the package
- return pack;
- }
-
- /**
- * Subclasses may extend this method to provide their own java file creation path.
- * This implementation will use the properties specified in the data model to create
- * a default java class. The class will be built using pre-defined tokens and will be
- * built up using a string buffer. The method getJavaFileContent will handle the building
- * of the string buffer while this method will write those contents to the file.
- * This method does not accept null parameters.
- * @see INewJavaClassDataModelProperties#CLASS_NAME
- * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
- *
- * @param sourceFolder
- * @param pack
- */
- protected void createJavaFile(IFolder sourceFolder, IPackageFragment pack) {
- // Retrieve properties from the java class data model
- String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
- String className = model.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME);
- String fileName = className + ".java"; //$NON-NLS-1$
- //ICompilationUnit cu = null;
- try {
- // Get the java file content from the string buffer
- String content = getJavaFileContent(pack, className);
- // Create the compilation unit
- pack.createCompilationUnit(fileName, content, true, null);
- byte[] contentBytes = content.getBytes();
- IPath packageFullPath = new Path(packageName.replace('.', IPath.SEPARATOR));
- IPath javaFileFullPath = packageFullPath.append(fileName);
- IFile file = sourceFolder.getFile(javaFileFullPath);
- // Set the contents in the file if it already exists
- if (file != null && file.exists()) {
- file.setContents(new ByteArrayInputStream(contentBytes), false, true, null);
- } // If the file does not exist, create it with the contents
- else if (file != null) {
- file.create(new ByteArrayInputStream(contentBytes), false, null);
- }
- // editModel.getWorkingCopy(cu, true); //Track CU.
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- /**
- * This is intended for internal use only. This is where the string buffer for the contents
- * of the java file is built up using the properties in the data model and the predefined tokens.
- * This method will not accept null parameters. It will not return null.
- * @see NewJavaClassDataModelProvider
- * @see NewJavaClassOperation#createJavaFile(IFolder, IPackageFragment)
- *
- * @param pack
- * @param className
- * @return String java file contents
- */
- private String getJavaFileContent(IPackageFragment pack, String className) {
- // Create the superclass name
- String superclassName = model.getStringProperty(INewJavaClassDataModelProperties.SUPERCLASS);
- List interfaces = (List) model.getProperty(INewJavaClassDataModelProperties.INTERFACES);
- String packageStatement = getPackageStatement(pack);
- // Create the import statements
- setupImportStatements(pack, superclassName, interfaces);
- // Create the class declaration
- String classDeclaration = getClassDeclaration(superclassName, className, interfaces);
- // Create the fields
- String fields = getFields();
- // Create the methods
- String methods = getMethodStubs(superclassName, className);
-
- StringBuffer contents = new StringBuffer();
- // Add the package statement to the buffer
- contents.append(packageStatement);
- // Add all the import statements to the buffer
- for (int i = 0; i < importStatements.size(); i++) {
- contents.append(IMPORT + importStatements.get(i) + SEMICOLON);
- contents.append(lineSeparator);
- }
- contents.append(lineSeparator);
- // Add the class declaration to the buffer
- contents.append(classDeclaration);
- // Add the fields to the buffer
- contents.append(fields);
- // Add the method bodies to the buffer
- contents.append(methods);
- contents.append(CLOSE_BRA);
- // Return the contents of the buffer
- return contents.toString();
- }
-
- /**
- * This is intended for internal use only. This method will return a package string for
- * the class. It will not accept a null parameter. It will not return null.
- * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
- *
- * @param pack
- * @return String package statement
- */
- private String getPackageStatement(IPackageFragment pack) {
- StringBuffer sb = new StringBuffer();
- // If it is not default package, add package statement
- if (!pack.isDefaultPackage()) {
- sb.append(PACKAGE + pack.getElementName() + SEMICOLON);
- sb.append(lineSeparator);
- sb.append(lineSeparator);
- }
- // Return contents of buffer
- return sb.toString();
- }
-
- /**
- * This method is intended for internal use. It checks to see if the qualified class name
- * belongs to the specified package. This method will not accept nulls. It will not return null.
- * @see NewJavaClassOperation#setupImportStatements(IPackageFragment, String, List)
- *
- * @param packageFragment
- * @param className
- * @return boolean is class in this package?
- */
- private boolean isSamePackage(IPackageFragment packageFragment, String className) {
- if (className != null && className.length() > 0) {
- String sPackageName = packageFragment.getElementName();
- String classPackageName = Signature.getQualifier(className);
- // Does the qualified class's package name match the passed in package's name?
- if (classPackageName.equals(sPackageName))
- return true;
- }
- return false;
- }
-
- /**
- * This method is intended for internal use only. This method will set up the required import
- * statements and cache to the importStatements list.
- * This method does not accept null parameters.
- * @see NewJavaClassOperation#importStatements
- * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
- *
- * @param pack
- * @param superclassName
- * @param interfaces
- */
- private void setupImportStatements(IPackageFragment pack, String superclassName, List interfaces) {
- // If there is a superclass and it is not in the same package, add an import for it
- if (superclassName != null && superclassName.length() > 0) {
- if (!superclassName.equals(JAVA_LANG_OBJECT) && !isSamePackage(pack, superclassName)) {
- importStatements.add(superclassName);
- }
- }
- // Add an import the list of implemented interfaces
- if (interfaces != null && interfaces.size() > 0) {
- int size = interfaces.size();
- for (int i = 0; i < size; i++) {
- String interfaceName = (String) interfaces.get(i);
- importStatements.add(interfaceName);
- }
- }
- }
-
- /**
- * This class is intended for internal use only. This will build up the class declartion
- * statement based off the properties set in the java class data model.
- * This method does not accept null parameters. It will not return null.
- * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
- *
- * @param superclassName
- * @param className
- * @param interfaces
- * @return String class declaration string
- */
- private String getClassDeclaration(String superclassName, String className, List interfaces) {
- StringBuffer sb = new StringBuffer();
- // Append appropriate modifiers
- if (model.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_PUBLIC))
- sb.append(PUBLIC);
- if (model.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT))
- sb.append(ABSTRACT);
- if (model.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_FINAL))
- sb.append(FINAL);
- // Add the class token
- sb.append(CLASS);
- // Add the class name
- sb.append(className + SPACE);
- // If there is a superclass, add the extends and super class name
- if (superclassName != null && superclassName.length() > 0 && !superclassName.equals(JAVA_LANG_OBJECT)) {
- int index = superclassName.lastIndexOf(DOT);
- if (index != -1)
- superclassName = superclassName.substring(index + 1);
- sb.append(EXTENDS + superclassName + SPACE);
- }
- // If there are interfaces, add the implements and then interate over the interface list
- if (interfaces != null && interfaces.size() > 0) {
- sb.append(IMPLEMENTS);
- int size = interfaces.size();
- for (int i = 0; i < size; i++) {
- String interfaceName = (String) interfaces.get(i);
- int index = interfaceName.lastIndexOf(DOT);
- if (index != -1)
- interfaceName = interfaceName.substring(index + 1);
- sb.append(interfaceName);
- if (i < size - 1)
- sb.append(COMMA);
- sb.append(SPACE);
- }
- }
- sb.append(OPEN_BRA);
- sb.append(lineSeparator);
- // Return the finished class declaration string
- return sb.toString();
- }
-
- /**
- * Subclasses may extend this method to add their own fields. The default implementation
- * is not to have any fields. This method will not return null.
- * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
- *
- * @return String fields string
- */
- protected String getFields() {
- return EMPTY_STRING;
- }
-
- /**
- * This method is intended for internal use only. This will build up a string with the
- * contents of all the method stubs for the unimplemented methods defined in the interfaces.
- * It will also add inherited constructors from the superclass as appropriate.
- * This method does not accept null parameters. It will not return null.
- * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
- *
- * @param superclassName
- * @param className
- * @return String method stubs string
- */
- private String getMethodStubs(String superclassName, String className) {
- StringBuffer sb = new StringBuffer();
- IJavaProject javaProj = JemProjectUtilities.getJavaProject(getTargetProject());
- if (model.getBooleanProperty(INewJavaClassDataModelProperties.MAIN_METHOD)) {
- // Add main method
- sb.append(MAIN_METHOD);
- sb.append(lineSeparator);
- sb.append(TODO_COMMENT);
- sb.append(lineSeparator);
- sb.append(TAB + CLOSE_BRA);
- sb.append(lineSeparator);
- sb.append(lineSeparator);
- }
-
- IType superClassType = null;
- if (model.getBooleanProperty(INewJavaClassDataModelProperties.CONSTRUCTOR) || model.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS)) {
- // Find super class type
- try {
- superClassType = javaProj.findType(superclassName);
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- }
- if (model.getBooleanProperty(INewJavaClassDataModelProperties.CONSTRUCTOR)) {
- // Implement constructors from superclass
- try {
- if (superClassType != null) {
- IMethod[] methods = superClassType.getMethods();
- for (int j = 0; j < methods.length; j++) {
- if (methods[j].isConstructor() && !Flags.isPrivate(methods[j].getFlags())) {
- String methodStub = getMethodStub(methods[j], superclassName, className);
- sb.append(methodStub);
- }
- }
- }
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- }
- // Add unimplemented methods defined in the interfaces list
- if (model.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS) && superClassType != null) {
- String methodStub = getUnimplementedMethodsFromSuperclass(superClassType, className);
- if (methodStub != null && methodStub.trim().length() > 0)
- sb.append(methodStub);
- methodStub = getUnimplementedMethodsFromInterfaces(superClassType, className, javaProj);
- if (methodStub != null && methodStub.trim().length() > 0)
- sb.append(methodStub);
- }
- // Add any user defined method stubs
- if (superClassType != null) {
- String userDefined = getUserDefinedMethodStubs(superClassType);
- if (userDefined != null && userDefined.trim().length() > 0)
- sb.append(userDefined);
- }
- // Return the methods string
- return sb.toString();
- }
-
- /**
- * This method is intended for internal use only. This will retrieve method stubs for
- * unimplemented methods in the superclass that will need to be created in the new class.
- * This method does not accept null parameters. It will not return null.
- * @see NewJavaClassOperation#getMethodStubs(String, String)
- *
- * @param superClassType
- * @param className
- * @return String unimplemented methods defined in superclass
- */
- private String getUnimplementedMethodsFromSuperclass(IType superClassType, String className) {
- StringBuffer sb = new StringBuffer();
- try {
- // Implement abstract methods from superclass
- IMethod[] methods = superClassType.getMethods();
- for (int j = 0; j < methods.length; j++) {
- IMethod method = methods[j];
- int flags = method.getFlags();
- // Add if the method is abstract, not private or static, and the option is selected in data model
- if ((Flags.isAbstract(flags) && !Flags.isStatic(flags) && !Flags.isPrivate(flags)) || implementImplementedMethod(methods[j])) {
- String methodStub = getMethodStub(methods[j], superClassType.getFullyQualifiedName(), className);
- sb.append(methodStub);
- }
- }
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- // Return method stubs string
- return sb.toString();
- }
-
- /**
- * This method is intended for internal use only. This will retrieve method stubs for
- * unimplemented methods defined in the interfaces that will need to be created in the new class.
- * This method does not accept null parameters. It will not return null.
- * @see NewJavaClassOperation#getMethodStubs(String, String)
- *
- * @param superClassType
- * @param className
- * @param javaProj
- * @return String unimplemented methods defined in interfaces
- */
- private String getUnimplementedMethodsFromInterfaces(IType superClassType, String className, IJavaProject javaProj) {
- StringBuffer sb = new StringBuffer();
- try {
- // Implement defined methods from interfaces
- List interfaces = (List) model.getProperty(INewJavaClassDataModelProperties.INTERFACES);
- if (interfaces != null) {
- for (int i = 0; i < interfaces.size(); i++) {
- String qualifiedClassName = (String) interfaces.get(i);
- IType interfaceType = javaProj.findType(qualifiedClassName);
- IMethod[] methodArray = interfaceType.getMethods();
- // Make sure the method isn't already defined in the heirarchy
- for (int j = 0; j < methodArray.length; j++) {
- if (isMethodImplementedInHierarchy(methodArray[j], superClassType))
- continue;
- String methodStub = getMethodStub(methodArray[j], qualifiedClassName, className);
- sb.append(methodStub);
- }
- }
- }
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- // Return method stubs string
- return sb.toString();
- }
-
- /**
- * This method is intended for internal use only. Checks to see if the passed type name
- * is of a primitive type. This method does not accept null. It will not return null.
- * @see Signature#getElementType(java.lang.String)
- *
- * @param typeName
- * @return boolean is type Primitive?
- */
- private boolean isPrimitiveType(String typeName) {
- char first = Signature.getElementType(typeName).charAt(0);
- return (first != Signature.C_RESOLVED && first != Signature.C_UNRESOLVED);
- }
-
- /**
- * This method is intended for internal use only. This will add import statements for the specified
- * type if it is determined to be necessary. This does accept null parameters. It will not return null.
- * @see NewJavaClassOperation#getMethodStub(IMethod, String, String)
- *
- * @param refTypeSig
- * @param declaringType
- * @return String type signature
- * @throws JavaModelException
- */
- private String resolveAndAdd(String refTypeSig, IType declaringType) throws JavaModelException {
- String resolvedTypeName = JavaModelUtil.getResolvedTypeName(refTypeSig, declaringType);
- // Could type not be resolved and is import statement missing?
- if (resolvedTypeName != null && !importStatements.contains(resolvedTypeName) && !resolvedTypeName.startsWith("java.lang")) { //$NON-NLS-1$
- importStatements.add(resolvedTypeName);
- }
- return Signature.toString(refTypeSig);
- }
-
- /**
- * This method is intended for internal use only. This will use the predefined tokens to generate the
- * actual method stubs. This method does not accept null parameters. It will not return null.
- *
- * @param method
- * @param superClassName
- * @param className
- * @return String method stub
- */
- private String getMethodStub(IMethod method, String superClassName, String className) {
- StringBuffer sb = new StringBuffer();
- try {
- IType parentType = method.getDeclaringType();
- String name = method.getElementName();
- String[] paramTypes = method.getParameterTypes();
- String[] paramNames = method.getParameterNames();
- String[] exceptionTypes = method.getExceptionTypes();
-
- // Parameters String
- String paramString = EMPTY_STRING;
- int nP = paramTypes.length;
- for (int i = 0; i < nP; i++) {
- String type = paramTypes[i];
- // update import statements
- if (!isPrimitiveType(type)) {
- type = resolveAndAdd(type, parentType);
- } else {
- type = Signature.toString(type);
- }
-
- int index = type.lastIndexOf(DOT);
- if (index != -1)
- type = type.substring(index + 1);
- paramString += type + SPACE + paramNames[i];
- if (i < nP - 1)
- paramString += COMMA + SPACE;
- }
- // Java doc
- sb.append("\t/* (non-Java-doc)"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append("\t * @see "); //$NON-NLS-1$
- sb.append(superClassName + POUND + name + OPEN_PAR);
- sb.append(paramString);
- sb.append(CLOSE_PAR);
- sb.append(lineSeparator);
- sb.append("\t */"); //$NON-NLS-1$
- sb.append(lineSeparator);
- // access
- sb.append(TAB);
- if (Flags.isPublic(method.getFlags()))
- sb.append(PUBLIC);
- else if (Flags.isProtected(method.getFlags()))
- sb.append(PROTECTED);
- else if (Flags.isPrivate(method.getFlags()))
- sb.append(PRIVATE);
- String returnType = null;
- if (method.isConstructor()) {
- sb.append(className);
- } else {
- // return type
- returnType = method.getReturnType();
- if (!isPrimitiveType(returnType)) {
- returnType = resolveAndAdd(returnType, parentType);
- } else {
- returnType = Signature.toString(returnType);
- }
- int idx = returnType.lastIndexOf(DOT);
- if (idx == -1)
- sb.append(returnType);
- else
- sb.append(returnType.substring(idx + 1));
- sb.append(SPACE);
- // name
- sb.append(name);
- }
- // Parameters
- sb.append(OPEN_PAR + paramString + CLOSE_PAR);
- // exceptions
- int nE = exceptionTypes.length;
- if (nE > 0) {
- sb.append(SPACE + THROWS);
- for (int i = 0; i < nE; i++) {
- String type = exceptionTypes[i];
- if (!isPrimitiveType(type)) {
- type = resolveAndAdd(type, parentType);
- } else {
- type = Signature.toString(type);
- }
- int index = type.lastIndexOf(DOT);
- if (index != -1)
- type = type.substring(index + 1);
- sb.append(type);
- if (i < nE - 1)
- sb.append(COMMA + SPACE);
- }
- }
- sb.append(SPACE + OPEN_BRA);
- sb.append(lineSeparator);
- if (method.isConstructor()) {
- sb.append(TAB + TAB + SUPER + OPEN_PAR);
- for (int i = 0; i < nP; i++) {
- sb.append(paramNames[i]);
- if (i < nP - 1)
- sb.append(COMMA + SPACE);
- }
- sb.append(CLOSE_PAR + SEMICOLON);
- sb.append(lineSeparator);
- } else {
- String methodBody = getMethodBody(method, returnType);
- sb.append(methodBody);
- }
- sb.append(TAB + CLOSE_BRA);
- sb.append(lineSeparator);
- sb.append(lineSeparator);
- } catch (JavaModelException e) {
- Logger.getLogger().log(e);
- }
- return sb.toString();
- }
-
- /**
- * This method is intended for internal use only. It checks to see whether or not the
- * method is already implemented in the class heirarchy.
- * It does not accept null parameters. It will not return null.
- * @see NewJavaClassOperation#getUnimplementedMethodsFromInterfaces(IType, String, IJavaProject)
- *
- * @param method
- * @param superClass
- * @return boolean is method already in heirarchy?
- */
- private boolean isMethodImplementedInHierarchy(IMethod method, IType superClass) {
- boolean ret = false;
- IMethod foundMethod = findMethodImplementationInHierarchy(method, superClass);
- // if the method exists and the property is set on the data model, then return true
- if (foundMethod != null && foundMethod.exists() && !implementImplementedMethod(method))
- ret = true;
- return ret;
- }
-
- /**
- * This method is intended for internal use only. This will recursively check the supertype heirarchy for
- * the passed in method. This will not accept null parameters. It will return null if the method does
- * not already exist in the heirarchy.
- * @see NewJavaClassOperation#isMethodImplementedInHierarchy(IMethod, IType)
- *
- * @param method
- * @param superClass
- * @return IMethod the method from the heirarchy
- */
- private IMethod findMethodImplementationInHierarchy(IMethod method, IType superClass) {
- IMethod implementedMethod = null;
- try {
- if (superClass != null && superClass.exists()) {
- ITypeHierarchy tH = superClass.newSupertypeHierarchy(new NullProgressMonitor());
- implementedMethod = findMethodImplementationInHierarchy(tH, superClass, method.getElementName(), method.getParameterTypes(), method.isConstructor());
- }
- } catch (JavaModelException e) {
- //Ignore
- }
- return implementedMethod;
- }
-
- /**
- * This method is intended for internal use only. This will recursively check the supertype heirarchy for
- * the passed in method. This will not accept null parameters. It will return null if the method does
- * not already exist in the heirarchy.
- * @see NewJavaClassOperation#findMethodImplementationInHierarchy(IMethod, IType)
- * @see JavaModelUtil#findMethodImplementationInHierarchy(ITypeHierarchy, IType, String, String[], boolean)
- *
- * @param tH
- * @param thisType
- * @param methodName
- * @param parameterTypes
- * @param isConstructor
- * @return IMethod
- * @throws JavaModelException
- */
- private IMethod findMethodImplementationInHierarchy(ITypeHierarchy tH, IType thisType, String methodName, String parameterTypes[], boolean isConstructor) throws JavaModelException {
- IMethod found = JavaModelUtil.findMethod(methodName, parameterTypes, isConstructor, thisType);
- // If method exists make sure it is not abstract
- if (found != null && !Flags.isAbstract(found.getFlags())) {
- return found;
- }
- // Check recursively
- return JavaModelUtil.findMethodImplementationInHierarchy(tH, thisType, methodName, parameterTypes, isConstructor);
- }
-
- /**
- * Subclasses may extend this method to provide their own specific method body definitions.
- * The default implementation is to add a todo, and to return the appropriate type.
- * This method does not accept null parameters. It will not return null.
- * @see NewJavaClassOperation#getMethodStub(IMethod, String, String)
- *
- * @param method
- * @param returnType
- * @return String method body
- */
- protected String getMethodBody(IMethod method, String returnType) {
- // Add a todo comment
- String body = TODO_COMMENT;
- body += lineSeparator;
- // Add the appropriate default return type
- if (returnType == null || returnType.equals(VOID))
- return body;
- if (returnType.equals(INT))
- body += RETURN_0;
- else if (returnType.equals(BOOLEAN))
- body += RETURN_FALSE;
- else
- body += RETURN_NULL;
- body += lineSeparator;
- // Return the method body
- return body;
- }
-
- /**
- * Subclasses may extend this method to provide their own user defined method stubs. The
- * default implementation to just return an empty string. This method will not accept
- * null parameter. It will not return null.
- * @see NewJavaClassOperation#getMethodStubs(String, String)
- *
- * @param superClassType
- * @return String user defined methods
- */
- protected String getUserDefinedMethodStubs(IType superClassType) {
- return EMPTY_STRING;
- }
-
- /**
- * Subclasses may extend this method to provide their own specialized return on which nonimplemented
- * methods to implement. This does not accept a null parameter. This will not return null.
- * The default implementation is to always return false.
- *
- * @param method
- * @return boolean should implement method?
- */
- protected boolean implementImplementedMethod(IMethod method) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java
deleted file mode 100644
index 05886e5..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java
+++ /dev/null
@@ -1,272 +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.jst.j2ee.internal.common.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-
-/**
- * Insert the type's description here. Creation date: (9/10/2001 12:35:38 PM)
- *
- * @author: Administrator
- */
-public class UpdateJavaBuildPathOperation implements IHeadlessRunnableWithProgress {
- protected IJavaProject javaProject;
- protected ClassPathSelection classPathSelection;
- //All the Java build path entries created by the classpath selection
- protected Set allClasspathEntries;
- protected List allUnselectedClasspathEntries;
-
- /**
- * UpdateJavaBuildPathOperation constructor comment.
- */
- public UpdateJavaBuildPathOperation(IJavaProject aJavaProject, ClassPathSelection aClassPathSelection) {
- super();
- javaProject = aJavaProject;
- classPathSelection = aClassPathSelection;
- allClasspathEntries = new HashSet();
- IClasspathEntry[] classpathEntry = aClassPathSelection.getClasspathEntriesForSelected();
- if(classpathEntry != null)
- allClasspathEntries.addAll(Arrays.asList(classpathEntry));
- }
-
- /**
- * UpdateJavaBuildPathOperation constructor comment.
- */
- public UpdateJavaBuildPathOperation(IJavaProject aJavaProject, ClassPathSelection selected,ClassPathSelection unselected) {
- super();
- javaProject = aJavaProject;
- classPathSelection = selected;
- allClasspathEntries = new HashSet();
- if(selected != null && !selected.getClasspathElements().isEmpty())
- allClasspathEntries.addAll(Arrays.asList(selected.getClasspathEntriesForSelected()));
-
- allUnselectedClasspathEntries = new ArrayList();
- if(unselected != null && !unselected.getClasspathElements().isEmpty())
- allUnselectedClasspathEntries.addAll(unselected.getClasspathElements());
- }
-
- public UpdateJavaBuildPathOperation(IJavaProject aJavaProject, ClassPathSelection selected, List unselected) {
- super();
- javaProject = aJavaProject;
- classPathSelection = selected;
- allClasspathEntries = new HashSet();
- if(selected != null && !selected.getClasspathElements().isEmpty())
- allClasspathEntries.addAll(Arrays.asList(selected.getClasspathEntriesForSelected()));
-
- allUnselectedClasspathEntries = new ArrayList();
- if(unselected != null && !unselected.isEmpty())
- allUnselectedClasspathEntries.addAll(unselected);
- }
-
- protected void ensureClasspathEntryIsExported(List cp, IClasspathEntry entry) {
- if (entry.isExported())
- return;
- int index = getIndex(cp, entry);
- IClasspathEntry newEntry = null;
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_PROJECT :
- newEntry = JavaCore.newProjectEntry(entry.getPath(), true);
- break;
- case IClasspathEntry.CPE_LIBRARY :
- newEntry = JavaCore.newLibraryEntry(entry.getPath(), entry.getSourceAttachmentPath(), entry.getSourceAttachmentRootPath(), true);
- break;
- case IClasspathEntry.CPE_VARIABLE:
- newEntry = JavaCore.newVariableEntry(entry.getPath(), entry.getSourceAttachmentPath(), entry.getSourceAttachmentRootPath());
- default :
- break;
- }
- if (entry != null)
- cp.set(index, newEntry);
- }
-
- protected IClasspathEntry ensureElementInList(List cp, ClasspathElement element, IClasspathEntry predecessor) {
- IClasspathEntry addedEntry = null;
- //The element might have multiple entries in the case of
- //the imported_classes.jar file
- IClasspathEntry[] cpEntries = element.newClasspathEntries();
- if (cpEntries == null || cpEntries.length == 0)
- //indicates an invalid entry
- return null;
-
- int predecessorPos = predecessor == null ? -1 : getIndex(cp, predecessor);
- addedEntry = cpEntries[0];
- //Ensure that the first item is in the list, and follows
- //the predecessor if specified; preserve existing items in
- //the case of source attachments
- int pos = getIndex(cp, addedEntry);
- if (pos == -1) {
- if (predecessorPos == -1)
- cp.add(addedEntry);
- else
- cp.add(predecessorPos + 1, addedEntry);
- } else {
- addedEntry = (IClasspathEntry) cp.get(pos);
- if (pos < predecessorPos) {
- cp.remove(addedEntry);
- cp.add(predecessorPos, addedEntry);
- }
- }
- ensureClasspathEntryIsExported(cp, addedEntry);
-
- //Remove and add so we can ensure the proper order; this
- //is the case of the imported_classes.jar; we always want it
- //directly after the project
- for (int i = 1; i < cpEntries.length; i++) {
- int index = getIndex(cp, cpEntries[i]);
- if (index != -1) {
- addedEntry = (IClasspathEntry) cp.get(index);
- cp.remove(index);
- } else
- addedEntry = cpEntries[i];
- pos = getIndex(cp, cpEntries[0]);
- cp.add(pos + 1, addedEntry);
- }
- return addedEntry;
- }
-
- protected int getIndex(List cp, IClasspathEntry entry) {
- for (int i = 0; i < cp.size(); i++) {
- IClasspathEntry elmt = (IClasspathEntry) cp.get(i);
- if (elmt.getPath().equals(entry.getPath()))
- return i;
- }
- return -1;
- }
-
- protected void ensureElementNotInList(List cp, ClasspathElement element) {
- IClasspathEntry[] cpEntries = element.newClasspathEntries();
- if (cpEntries == null || cpEntries.length == 0)
- return;
- for (int i = 0; i < cpEntries.length; i++) {
- if (allClasspathEntries.contains(cpEntries[i]))
- //This may be included indirectly by a transitive dependency
- continue;
- int index = getIndex(cp, cpEntries[i]);
- if (index != -1)
- cp.remove(index);
- }
- }
-
- protected void ensureRemoveElementInList(List cp, ClasspathElement element) {
- IClasspathEntry[] cpEntries = element.newClasspathEntries();
- if (cpEntries == null || cpEntries.length == 0)
- return;
- for (int i = 0; i < cpEntries.length; i++) {
- if (cp.contains(cpEntries[i])) {
- int index = getIndex(cp, cpEntries[i]);
- if (index != -1)
- cp.remove(index);
- }
- }
- }
-
- /**
- * Runs this operation. Progress should be reported to the given progress monitor. This method
- * is usually invoked by an <code>IRunnableContext</code>'s<code>run</code> method, which
- * supplies the progress monitor. A request to cancel the operation should be honored and
- * acknowledged by throwing <code>InterruptedException</code>.
- *
- * @param monitor
- * the progress monitor to use to display progress and receive requests for
- * cancelation
- * @exception InvocationTargetException
- * if the run method must propagate a checked exception, it should wrap it inside
- * an <code>InvocationTargetException</code>; runtime exceptions are
- * automatically wrapped in an <code>InvocationTargetException</code> by the
- * calling context
- * @exception InterruptedException
- * if the operation detects a request to cancel, using
- * <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- *
- * @see IRunnableContext#run
- */
- public void run(org.eclipse.core.runtime.IProgressMonitor monitor) throws java.lang.reflect.InvocationTargetException, InterruptedException {
- try {
- String[] prevRequiredProjects = javaProject.getRequiredProjectNames();
- List cp = new ArrayList(Arrays.asList(javaProject.getRawClasspath()));
- List classpathElements = classPathSelection.getClasspathElements();
- IClasspathEntry predecessor = null;
- IClasspathEntry result = null;
- for (int i = 0; i < classpathElements.size(); i++) {
- ClasspathElement element = (ClasspathElement) classpathElements.get(i);
- if (element.isSelected()) {
- result = ensureElementInList(cp, element, predecessor);
- if (result != null)
- predecessor = result;
- } else
- ensureElementNotInList(cp, element);
- }
- filterUnselectedEntries(cp);
- IClasspathEntry[] newCp = ((IClasspathEntry[]) cp.toArray(new IClasspathEntry[cp.size()]));
- javaProject.setRawClasspath(newCp, monitor);
- updateRequiredProjects(javaProject, prevRequiredProjects, new SubProgressMonitor(monitor, 1));
- } catch (Exception ex) {
- throw new WFTWrappedException(ex);
- }
- }
-
- private void filterUnselectedEntries(List cp) {
- if (allUnselectedClasspathEntries != null) {
- for (int i = 0; i < allUnselectedClasspathEntries.size(); i++) {
- ClasspathElement element = (ClasspathElement) allUnselectedClasspathEntries.get(i);
- ensureRemoveElementInList(cp, element);
- }
- }
- }
-
- protected void updateRequiredProjects(IJavaProject jproject, String[] prevRequiredProjects, IProgressMonitor monitor) throws CoreException {
- String[] newRequiredProjects = jproject.getRequiredProjectNames();
-
- ArrayList prevEntries = new ArrayList(Arrays.asList(prevRequiredProjects));
- ArrayList newEntries = new ArrayList(Arrays.asList(newRequiredProjects));
-
- IProject proj = jproject.getProject();
- IProjectDescription projDesc = proj.getDescription();
-
- ArrayList newRefs = new ArrayList();
- IProject[] referencedProjects = projDesc.getReferencedProjects();
- for (int i = 0; i < referencedProjects.length; i++) {
- String curr = referencedProjects[i].getName();
- if (newEntries.remove(curr) || !prevEntries.contains(curr)) {
- newRefs.add(referencedProjects[i]);
- }
- }
- IWorkspaceRoot root = proj.getWorkspace().getRoot();
- for (int i = 0; i < newEntries.size(); i++) {
- String curr = (String) newEntries.get(i);
- newRefs.add(root.getProject(curr));
- }
- projDesc.setReferencedProjects((IProject[]) newRefs.toArray(new IProject[newRefs.size()]));
- proj.setDescription(projDesc, monitor);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java
deleted file mode 100644
index 6e449ca..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class DefaultWSDLServiceHelper implements WSDLServiceHelper {
-
- /**
- *
- */
- public DefaultWSDLServiceHelper() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortName(java.lang.Object)
- */
- public String getPortName(Object port) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServicePorts(java.lang.Object)
- */
- public Map getServicePorts(Object aService) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceNamespaceURI(java.lang.Object)
- */
- public String getServiceNamespaceURI(Object aService) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceDefinitionLocation(org.eclipse.emf.ecore.EObject)
- */
- public Object getServiceDefinitionLocation(EObject aService) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortBindingNamespaceURI(java.lang.Object)
- */
- public String getPortBindingNamespaceURI(Object aPort) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceLocalPart(java.lang.Object)
- */
- public String getServiceLocalPart(Object aService) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceQName(java.lang.Object)
- */
- public Object getServiceQName(Object aService) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getDefinitionServices(java.lang.Object)
- */
- public Map getDefinitionServices(Object aDefinition) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(java.lang.String)
- */
- public Object getWSDLDefinition(String wsdlURL) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(org.eclipse.emf.ecore.resource.Resource)
- */
- public Object getWSDLDefinition(Resource wsdlResource) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWsdlServicesFromWsilFile(org.eclipse.core.resources.IFile)
- */
- public List getWsdlServicesFromWsilFile(IFile wsil) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isService(Object aService) {
- // TODO Auto-generated method stub
- return false;
- }
- public boolean isWSDLResource(Object aResource) {
- // TODO Auto-generated method stub
- return false;
- }
- public boolean isDefinition(Object aDefinition) {
- // TODO Auto-generated method stub
- return false;
- }
-
- public List get13ServiceRefs(EObject j2eeObject) {
- // TODO Auto-generated method stub
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtManager.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtManager.java
deleted file mode 100644
index 369c7b9..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtManager.java
+++ /dev/null
@@ -1,32 +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.jst.j2ee.internal.webservices;
-
-public class WSDLServiceExtManager {
- public static WSDLServiceHelper extension;
-
- public static WSDLServiceHelper getServiceHelper() {
- return extension;
- }
-
- public static void registerWSDLServiceHelper(WSDLServiceHelper ext) {
- extension = ext;
- }
-
- public static void removeWSDLServiceHelper() {
- extension = null;
- }
-
- public WSDLServiceExtManager() {
- super();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java
deleted file mode 100644
index c006c96..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java
+++ /dev/null
@@ -1,71 +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
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WSDLServiceExtensionRegistry extends RegistryReader {
-
- static final String EXTENSION_NAME = "WSDLServiceHelper"; //$NON-NLS-1$
- static final String ELEMENT_WSDL_HELPER = "wsdlHelper"; //$NON-NLS-1$
- static final String WSDL_HELPER_CLASS = "helperClass"; //$NON-NLS-1$
- private static WSDLServiceExtensionRegistry INSTANCE = null;
-
- public WSDLServiceExtensionRegistry() {
- super(J2EEPlugin.PLUGIN_ID, EXTENSION_NAME);
- }
-
- public static WSDLServiceExtensionRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new WSDLServiceExtensionRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * readElement() - parse and deal w/ an extension like: <earModuleExtension extensionClass =
- * "com.ibm.etools.web.plugin.WebModuleExtensionImpl"/>
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(ELEMENT_WSDL_HELPER))
- return false;
- WSDLServiceHelper extension = null;
- try {
- extension = (WSDLServiceHelper) element.createExecutableExtension(WSDL_HELPER_CLASS);
- } catch (Throwable e) {
- //Ignore
- }
- if (extension != null)
- addModuleExtension(extension);
- else // Register default do nothing helper......
- addModuleExtension(new DefaultWSDLServiceHelper());
- return true;
- }
-
-
- private static void addModuleExtension(WSDLServiceHelper ext) {
- WSDLServiceExtManager.registerWSDLServiceHelper(ext);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java
deleted file mode 100644
index be95217..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author cbridgha
- *
- * This interface is intended to expand the visibility of wsdl api, without a direct dependency
- */
-public interface WSDLServiceHelper {
-
- public static final String WSIL_EXT = "wsil"; //$NON-NLS-1$
-
- public String getPortName(Object port);
- public Map getServicePorts(Object aService);
- public String getServiceNamespaceURI(Object aService);
- public Object getServiceDefinitionLocation(EObject aService);
- public String getPortBindingNamespaceURI(Object aPort);
- public String getServiceLocalPart(Object aService);
- public Object getServiceQName(Object aService);
- public Map getDefinitionServices(Object aDefinition);
- public Object getWSDLDefinition(String wsdlURL);
- public Object getWSDLDefinition(Resource wsdlResource);
- public List getWsdlServicesFromWsilFile(IFile wsil);
- public boolean isService(Object aService);
- public boolean isWSDLResource(Object aResource);
- public boolean isDefinition(Object aDefinition);
- public List get13ServiceRefs(EObject j2eeObject);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceClientGenerator.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceClientGenerator.java
deleted file mode 100644
index 5797b89..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceClientGenerator.java
+++ /dev/null
@@ -1,56 +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
- *******************************************************************************/
-/*
- * Created on Apr 28, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-
-
-/**
- * Extension for generating web service clients
- */
-public abstract class WebServiceClientGenerator {
-
- public static final String GENERIC_J2EE_CONTAINER = J2EECommonMessages.WebServiceClientGenerator_UI_0;
-
- private List runtime = null;
-
- /**
- * Generates Web service client artifacts based on information obatined from the dataModel
- * (wsdlURL, serviceQName, outputWSDLFilePathName, projectName, shouldDeploy) After generating
- * the Web service client artifacts, sets the following on the dataModel: serviceInterfaceName,
- * serviceEndpointInterfaceName, didGenDescriptors
- *
- * @return Status for results
- */
- public abstract IStatus genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel);
-
- public void setRuntime(List serverTargets) {
- runtime = serverTargets;
- }
-
- public List getServerTargets() {
- if (runtime == null)
- runtime = new ArrayList();
- return runtime;
- }
-
- public boolean isRuntimeSupported(String serverTargetID) {
- return getServerTargets().contains(serverTargetID);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataHelper.java
deleted file mode 100644
index 909295e..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataHelper.java
+++ /dev/null
@@ -1,78 +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
- *******************************************************************************/
-/*
- * Created on Apr 26, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-
-/**
- * WebServicesClientDataHelper Interface Extension - For use in generating Web Service Clients by
- * sharing data between J2EE operations and web services operations
- */
-public interface WebServicesClientDataHelper {
-
- /**
- * @return the URL for the associated original WSDL file referenced by the client
- */
- public String getWSDLUrl();
-
- /**
- * @return the QName of form http://someNamespace:someLocalPart for the associated web service
- * for the client
- */
- public String getServiceQName();
-
- /**
- * @return the name of the target project for the web service client
- */
- public String getProjectName();
-
- /**
- * @return the URI for the fileName path for the copied WSDL file into the client project
- */
- public String getOutputWSDLFileName();
-
- /**
- * @return the qualified classname of the generated Service Interface
- */
- public String getServiceInterfaceName();
-
- /**
- * @return the qualified classname of the generated Service Endpoint Interface
- */
- public String[] getServiceEndpointInterfaceNames();
-
- /**
- * @return should generate code for deployment?
- */
- public boolean shouldDeploy();
-
- /**
- * @return whether the extension generated the descriptors or not
- */
- public boolean shouldGenDescriptors();
-
- /**
- * Set the SEI classname for the web service client
- */
- public void setServiceInterfaceName(String name);
-
- /**
- * Set the SI classname for the web service client
- */
- public void setServiceEndpointInterfaceNames(String[] names);
-
- /**
- * Set whether descriptors were generated
- */
- public void setDidGenDescriptors(boolean b);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataRegistry.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataRegistry.java
deleted file mode 100644
index 67160f6..0000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataRegistry.java
+++ /dev/null
@@ -1,86 +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
- *******************************************************************************/
-/*
- * Created on Apr 26, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * Read the WebServicesClientDataExtensions
- */
-public class WebServicesClientDataRegistry extends RegistryReader {
-
- private static WebServicesClientDataRegistry INSTANCE = null;
- public static final String WS_CLIENT_EXTENSION_POINT = "WebServiceClientGenerator"; //$NON-NLS-1$
- public static final String GENERATOR = "generator"; //$NON-NLS-1$
- public static final String CLASS_NAME = "className"; //$NON-NLS-1$
- public static final String SERVER_TARGET = "serverTarget"; //$NON-NLS-1$
- public static final String RUNTIME = "runtime"; //$NON-NLS-1$
- private List wsClientDataExtensions = null;
-
- /**
- * Default constructor
- */
- public WebServicesClientDataRegistry() {
- super(J2EEPlugin.PLUGIN_ID, WS_CLIENT_EXTENSION_POINT);
- }
-
- public static WebServicesClientDataRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new WebServicesClientDataRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(GENERATOR))
- return false;
- // Get the class specified in the extension point
- WebServiceClientGenerator helper = null;
- try {
- helper = (WebServiceClientGenerator) element.createExecutableExtension(CLASS_NAME);
- // get server target runtimes
- IConfigurationElement[] runtimes = element.getChildren(RUNTIME);
- List runtimeList = new ArrayList();
- for (int i = 0; i < runtimes.length; i++) {
- IConfigurationElement runtime = runtimes[i];
- String serverTarget = runtime.getAttribute(SERVER_TARGET);
- runtimeList.add(serverTarget);
- }
- helper.setRuntime(runtimeList);
- } catch (Exception e) {
- e.printStackTrace();
- }
- // Add data helper class to registry extensions list
- if (helper != null) {
- getWSClientGeneratorExtensions().add(helper);
- return true;
- }
- return false;
- }
-
- public List getWSClientGeneratorExtensions() {
- if (wsClientDataExtensions == null)
- wsClientDataExtensions = new ArrayList();
- return wsClientDataExtensions;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java
deleted file mode 100644
index 1b321b0..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java
+++ /dev/null
@@ -1,116 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This extended item provider supports two addition features, (@link CreateChildCommand} and
- * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
- * adapters using this common base class.
- */
-public class CommonItemProviderAdapter extends ItemProviderAdapter {
-
- /**
- * This creates and instance from an adapter factory and a domain notifier.
- */
- protected CommonItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This implements the default behavior for {@link CreateChildCommand}.
- */
- public Object createChild(Object object) {
- return null;
- }
-
- /**
- * This creates the default new children for {@link CreateChildrenCommand}.
- */
- public Collection createChildren(Object object) {
- return Collections.EMPTY_LIST;
- }
-
- /**
- * This returns the default image for {@link com.ibm.etools.common.command.CreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- Collection localChildrenReferences = getChildrenReferences(object);
- if (localChildrenReferences.size() != 1) {
- return J2EEPlugin.getPlugin().getImage("create_child");//$NON-NLS-1$
- }
- return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "Create" + //$NON-NLS-1$
- ((EReference) localChildrenReferences.iterator().next()).getEType().getName());
- }
-
- /**
- * This returns the default create children label.
- */
- public String getCreateChildrenText(Object object) {
- //EObject refObject = (EObject)object;
- Collection localChildrenReferences = getChildrenReferences(object);
- if (localChildrenReferences.size() != 1) {
- return CommonEditResourceHandler.getString("Create_Two_Children_UI_"); //$NON-NLS-1$
- }
- return CommonEditResourceHandler.getString("21concat", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$
- }
-
- /**
- * This returns the default create children help text.
- */
- public String getCreateChildrenToolTipText(Object object) {
- EObject refObject = (EObject) object;
- Collection localChildrenReferences = getChildrenReferences(object);
- if (localChildrenReferences.size() != 1) {
- return CommonEditResourceHandler.getString("19concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$
- }
- return CommonEditResourceHandler.getString("20concat_UI_", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$ = "Create two new children of type {0} for the selected {1}."
- }
-
- /**
- * This returns the default label for {@link com.ibm.etools.common.command.CreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- //EObject refObject = (EObject)object;
- Collection localChildrenReferences = getChildrenReferences(object);
- if (localChildrenReferences.size() != 1) {
- return CommonEditResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
- }
- return CommonEditResourceHandler.getString("18concat_UI_", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create {0}"
- }
-
- /**
- * This returns the default help text for
- * {@link com.ibm.etools.common.command.CreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- Collection localChildrenReferences = getChildrenReferences(object);
- if (localChildrenReferences.size() != 1) {
- return CommonEditResourceHandler.getString("29concat", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a new child for the selected {0}."
- }
- return CommonEditResourceHandler.getString("16concat_UI_", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type {0} for the selected {1}."
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java
deleted file mode 100644
index 27a6a5e..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,562 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.util.CommonAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
- * MOF adapter notificiations into {@link org.eclipse.jface.DomainEvent}s. The adapters also
- * support property sheets, see {@link com.ibm.itp.ui.api.propertysheet}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class CommonItemProviderAdapterFactory extends CommonAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}.
- */
- protected Collection supportedTypes = new ArrayList();
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.common.SecurityRole}
- * instances.
- */
- protected SecurityRoleItemProvider securityRoleItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.common.EjbRef}
- * instances.
- */
- protected EjbRefItemProvider ejbRefItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.common.ResourceRef}
- * instances.
- */
- protected ResourceRefItemProvider resourceRefItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.common.ResourceEnvRef}
- * instances.
- */
- protected ResourceEnvRefItemProvider resourceEnvRefItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.common.EnvEntry}
- * instances.
- */
- //ItemProviders
- protected EnvEntryItemProvider envEntryItemProvider;
-
- protected SecurityIdentityItemProvider securityIdentityItemProvider;
-
- protected RunAsSpecifiedIdentityItemProvider runAsSpecifiedIdentityItemProvider;
-
- protected IdentityItemProvider identityItemProvider;
-
- protected UseCallerIdentityItemProvider useCallerIdentityItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.common.SecurityRoleRef}instances.
- */
- protected SecurityRoleRefItemProvider securityRoleRefItemProvider;
- protected Disposable disposable = new Disposable();
-
- /**
- * This constructs an instance.
- */
- public CommonItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- public Adapter adapt(Notifier target, Object adapterKey) {
- return super.adapt(target, this);
- }
-
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- public Adapter adaptNew(Notifier target, Object adapterType) {
- Adapter adapter = super.adaptNew(target, adapterType);
- disposable.add(adapter);
- return adapter;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.EjbRef}.
- */
- public Adapter createEjbRefAdapter() {
- if (ejbRefItemProvider == null) {
- ejbRefItemProvider = new EjbRefItemProvider(this);
- }
-
- return ejbRefItemProvider;
- }
-
-
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.UseCallerIdentity}.
- */
- public Adapter createUseCallerIdentityAdapter() {
- if (useCallerIdentityItemProvider == null) {
- useCallerIdentityItemProvider = new UseCallerIdentityItemProvider(this);
- }
-
- return useCallerIdentityItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected DescriptionItemProvider descriptionItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createDescriptionAdapter() {
- if (descriptionItemProvider == null) {
- descriptionItemProvider = new DescriptionItemProvider(this);
- }
-
- return descriptionItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected QNameItemProvider qNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.QName}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createQNameAdapter() {
- if (qNameItemProvider == null) {
- qNameItemProvider = new QNameItemProvider(this);
- }
-
- return qNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ListenerItemProvider listenerItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createListenerAdapter() {
- if (listenerItemProvider == null) {
- listenerItemProvider = new ListenerItemProvider(this);
- }
-
- return listenerItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected CompatibilityDescriptionGroupItemProvider compatibilityDescriptionGroupItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createCompatibilityDescriptionGroupAdapter() {
- if (compatibilityDescriptionGroupItemProvider == null) {
- compatibilityDescriptionGroupItemProvider = new CompatibilityDescriptionGroupItemProvider(this);
- }
-
- return compatibilityDescriptionGroupItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.EnvEntry}.
- */
- public Adapter createEnvEntryAdapter() {
- if (envEntryItemProvider == null) {
- envEntryItemProvider = new EnvEntryItemProvider(this);
- }
-
- return envEntryItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.ResourceRef}.
- */
- public Adapter createResourceRefAdapter() {
- if (resourceRefItemProvider == null) {
- resourceRefItemProvider = new ResourceRefItemProvider(this);
- }
-
- return resourceRefItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.ResourceEnvRef}.
- */
- public Adapter createResourceEnvRefAdapter() {
- if (resourceEnvRefItemProvider == null) {
- resourceEnvRefItemProvider = new ResourceEnvRefItemProvider(this);
- }
-
- return resourceEnvRefItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EJBLocalRefItemProvider ejbLocalRefItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createEJBLocalRefAdapter() {
- if (ejbLocalRefItemProvider == null) {
- ejbLocalRefItemProvider = new EJBLocalRefItemProvider(this);
- }
-
- return ejbLocalRefItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.SecurityRole}.
- */
- public Adapter createSecurityRoleAdapter() {
- if (securityRoleItemProvider == null) {
- securityRoleItemProvider = new SecurityRoleItemProvider(this);
- }
-
- return securityRoleItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.Identity}.
- */
- public Adapter createIdentityAdapter() {
- if (identityItemProvider == null) {
- identityItemProvider = new IdentityItemProvider(this);
- }
-
- return identityItemProvider;
- }
-
-
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IconTypeItemProvider iconTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createIconTypeAdapter() {
- if (iconTypeItemProvider == null) {
- iconTypeItemProvider = new IconTypeItemProvider(this);
- }
-
- return iconTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected DisplayNameItemProvider displayNameItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createDisplayNameAdapter() {
- if (displayNameItemProvider == null) {
- displayNameItemProvider = new DisplayNameItemProvider(this);
- }
-
- return displayNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MessageDestinationRefItemProvider messageDestinationRefItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createMessageDestinationRefAdapter() {
- if (messageDestinationRefItemProvider == null) {
- messageDestinationRefItemProvider = new MessageDestinationRefItemProvider(this);
- }
-
- return messageDestinationRefItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MessageDestinationItemProvider messageDestinationItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createMessageDestinationAdapter() {
- if (messageDestinationItemProvider == null) {
- messageDestinationItemProvider = new MessageDestinationItemProvider(this);
- }
-
- return messageDestinationItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ParamValueItemProvider paramValueItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createParamValueAdapter() {
- if (paramValueItemProvider == null) {
- paramValueItemProvider = new ParamValueItemProvider(this);
- }
-
- return paramValueItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected DescriptionGroupItemProvider descriptionGroupItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Adapter createDescriptionGroupAdapter() {
- if (descriptionGroupItemProvider == null) {
- descriptionGroupItemProvider = new DescriptionGroupItemProvider(this);
- }
-
- return descriptionGroupItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.RunAsSpecifiedIdentity}.
- */
- public Adapter createRunAsSpecifiedIdentityAdapter() {
- if (runAsSpecifiedIdentityItemProvider == null) {
- runAsSpecifiedIdentityItemProvider = new RunAsSpecifiedIdentityItemProvider(this);
- }
-
- return runAsSpecifiedIdentityItemProvider;
- }
-
- public Adapter createSecurityIdentityAdapter() {
- if (securityIdentityItemProvider == null) {
- securityIdentityItemProvider = new SecurityIdentityItemProvider(this);
- }
-
- return securityIdentityItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.common.SecurityRoleRef}.
- */
- public Adapter createSecurityRoleRefAdapter() {
- if (securityRoleRefItemProvider == null) {
- securityRoleRefItemProvider = new SecurityRoleRefItemProvider(this);
- }
-
- return securityRoleRefItemProvider;
- }
-
- public void dispose() {
- disposable.dispose();
- }
-
- /**
- * This returns the root adapter factory that contains the factory.
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return (parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory());
- }
-
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This sets the composed adapter factory that contains the factory.
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java
deleted file mode 100644
index 9158a3a..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java
+++ /dev/null
@@ -1,173 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class CompatibilityDescriptionGroupItemProvider extends DescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public CompatibilityDescriptionGroupItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addSmallIconPropertyDescriptor(object);
- addLargeIconPropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- addDisplayNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addSmallIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_smallIcon_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_smallIcon_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_SmallIcon(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addLargeIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_largeIcon_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_largeIcon_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_LargeIcon(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_description_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_description_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addDisplayNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_displayName_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_displayName_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns CompatibilityDescriptionGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/CompatibilityDescriptionGroup"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((CompatibilityDescriptionGroup) object).getDisplayName();
- return label == null || label.length() == 0 ? getString("_UI_CompatibilityDescriptionGroup_type") : //$NON-NLS-1$
- getString("_UI_CompatibilityDescriptionGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(CompatibilityDescriptionGroup.class)) {
- case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON :
- case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON :
- case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION :
- case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java
deleted file mode 100644
index b4d292f..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java
+++ /dev/null
@@ -1,159 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class DescriptionGroupItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public DescriptionGroupItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- //childrenReferences.add(CommonPackage.eINSTANCE.getDescriptionGroup_Icons());
- //childrenReferences.add(CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames());
- //childrenReferences.add(CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns DescriptionGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/DescriptionGroup"); //$NON-NLS-1$
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_Icons(), CommonFactory.eINSTANCE.createIconType()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames(), CommonFactory.eINSTANCE.createDisplayName()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- return getString("_UI_DescriptionGroup_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(DescriptionGroup.class)) {
- case CommonPackage.DESCRIPTION_GROUP__ICONS :
- case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES :
- case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java
deleted file mode 100644
index 03f2ee4..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java
+++ /dev/null
@@ -1,147 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public DescriptionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addLangPropertyDescriptor(object);
- addValuePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLangPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Description_lang_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Description_lang_feature", "_UI_Description_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getDescription_Lang(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Description_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Description_value_feature", "_UI_Description_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getDescription_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns Description.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/Description"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- */
- public String getText(Object object) {
- String label = ((Description) object).getValue();
- return label == null || label.length() == 0 ? CommonEditResourceHandler.getString("Description_UI_") : //$NON-NLS-1$
- CommonEditResourceHandler.getString("Description_UI_") + ": " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Description.class)) {
- case CommonPackage.DESCRIPTION__LANG :
- case CommonPackage.DESCRIPTION__VALUE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java
deleted file mode 100644
index c1bd1e6..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java
+++ /dev/null
@@ -1,146 +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.jst.j2ee.common.internal.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DisplayNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public DisplayNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addLangPropertyDescriptor(object);
- addValuePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLangPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_DisplayName_lang_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_DisplayName_lang_feature", "_UI_DisplayName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getDisplayName_Lang(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_DisplayName_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_DisplayName_value_feature", "_UI_DisplayName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getDisplayName_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns DisplayName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/DisplayName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((DisplayName) object).getLang();
- return label == null || label.length() == 0 ? getString("_UI_DisplayName_type") : //$NON-NLS-1$
- getString("_UI_DisplayName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(DisplayName.class)) {
- case CommonPackage.DISPLAY_NAME__LANG :
- case CommonPackage.DISPLAY_NAME__VALUE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java
deleted file mode 100644
index 620d824..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java
+++ /dev/null
@@ -1,143 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class EJBLocalRefItemProvider extends EjbRefItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public EJBLocalRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addLocalHomePropertyDescriptor(object);
- addLocalPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * This adds a property descriptor for the Local Home feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addLocalHomePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_EJBLocalRef_localHome_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_EJBLocalRef_localHome_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getEJBLocalRef_LocalHome(), false));
- }
-
- /**
- * This adds a property descriptor for the Local feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- protected void addLocalPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_EJBLocalRef_local_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_EJBLocalRef_local_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getEJBLocalRef_Local(), false));
- }
-
-
- /**
- * This returns EJBLocalRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getDefault().getImage("ejb_local_ref_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- */
- public String getText(Object object) {
- String label = ((EJBLocalRef) object).getName();
- return label == null || label.length() == 0 ? CommonEditResourceHandler.getString("_UI_EJBLocalRef_type") : label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EJBLocalRef.class)) {
- case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME :
- case CommonPackage.EJB_LOCAL_REF__LOCAL : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java
deleted file mode 100644
index 05365e7..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java
+++ /dev/null
@@ -1,296 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.EjbRef}object.
- */
-public class EjbRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EjbRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns ejb_reference.gif.
- */
- public Object getImage(Object object) {
- String key = ((EjbRef) object).isLocal() ? "ejb_local_ref_obj" : "ejb_reference"; //$NON-NLS-1$ //$NON-NLS-2$
- return J2EEPlugin.getPlugin().getImage(key);
- }
-
- /**
- * This returns the parent of the EjbRef.
- */
- public Object getParent(Object object) {
- return object == null ? null : ((EjbRef) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
- pkg.getEjbRef_Name(), true));
-
- // This is for the type feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
- pkg.getEjbRef_Type(), false));
-
- // This is for the home feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Home_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_home_property_UI_"), //$NON-NLS-1$
- pkg.getEjbRef_Home(), false));
-
- // This is for the remote feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Remote_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_remote_property_UI_"), //$NON-NLS-1$
- pkg.getEjbRef_Remote(), false));
-
- // This is for the link feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
- pkg.getEjbRef_Link(), false));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
- pkg.getEjbRef_Description(), true));
-
- // This is for the client feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("Client_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_client_property_UI_"), //$NON-NLS-1$
- * pkg.getEjbRef_Client()));
- */
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
- * pkg.getEjbRef_WebApp()));
- */
-
- // This is for the ejb feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), // next four
- * lines for 175333 //ResourceHandler.getString("Ejb_UI_"), //$NON-NLS-1$
- * "EJB",//$NON-NLS-1$ //ResourceHandler.getString("The_ejb_property_UI_"),
- * //$NON-NLS-1$ ResourceHandler.getString("The_EJB_property_UI_"), //$NON-NLS-1$ = "The
- * EJB property" pkg.getEjbRef_Ejb()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEjbRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEjbRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_name_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEjbRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_type_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEjbRef_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Home feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHomePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_home_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_home_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEjbRef_Home(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Remote feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRemotePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_remote_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_remote_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEjbRef_Remote(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_link_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_link_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEjbRef_Link(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_description_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEjbRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getEjbRef_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- if (object instanceof EJBLocalRef)
- return "EjbLocalRef " + ((EJBLocalRef) object).getName(); //$NON-NLS-1$
- return "EjbRef " + ((EjbRef) object).getName(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EjbRef.class)) {
- case CommonPackage.EJB_REF__NAME :
- case CommonPackage.EJB_REF__TYPE :
- case CommonPackage.EJB_REF__HOME :
- case CommonPackage.EJB_REF__REMOTE :
- case CommonPackage.EJB_REF__LINK :
- case CommonPackage.EJB_REF__DESCRIPTION :
- case CommonPackage.EJB_REF__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
- * enumeration, and this to check that enumeration, but we know there can't be any children, so
- * this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java
deleted file mode 100644
index 4331c43..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java
+++ /dev/null
@@ -1,244 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.EnvEntry}object.
- */
-public class EnvEntryItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public EnvEntryItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns environment_entity.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("environment_entity");//$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the EnvEntry.
- */
- public Object getParent(Object object) {
-
- return object == null ? null : ((EnvEntry) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
- pkg.getEnvEntry_Description()));
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
- pkg.getEnvEntry_Name()));
-
- // This is for the value feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Value_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_value_property_UI_"), //$NON-NLS-1$
- pkg.getEnvEntry_Value()));
-
- // This is for the type feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
- pkg.getEnvEntry_Type()));
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
- * pkg.getEnvEntry_WebApp()));
- */
-
- // This is for the client feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("Client_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_client_property_UI_"), //$NON-NLS-1$
- * pkg.getEnvEntry_Client()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_description_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEnvEntry_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_name_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEnvEntry_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_value_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEnvEntry_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_type_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getEnvEntry_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getEnvEntry_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- return "EnvEntry " + ((EnvEntry) object).getName();//$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EnvEntry.class)) {
- case CommonPackage.ENV_ENTRY__DESCRIPTION :
- case CommonPackage.ENV_ENTRY__NAME :
- case CommonPackage.ENV_ENTRY__VALUE :
- case CommonPackage.ENV_ENTRY__TYPE :
- case CommonPackage.ENV_ENTRY__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEnvEntry_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEnvEntry_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
- * enumeration, and this to check that enumeration, but we know there can't be any children, so
- * this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java
deleted file mode 100644
index 18a8cd2..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java
+++ /dev/null
@@ -1,163 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class IconTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public IconTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addSmallIconPropertyDescriptor(object);
- addLargeIconPropertyDescriptor(object);
- addLangPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSmallIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_IconType_smallIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IconType_smallIcon_feature", "_UI_IconType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getIconType_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLargeIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_IconType_largeIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IconType_largeIcon_feature", "_UI_IconType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getIconType_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLangPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_IconType_lang_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IconType_lang_feature", "_UI_IconType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getIconType_Lang(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns IconType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/IconType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((IconType) object).getSmallIcon();
- return label == null || label.length() == 0 ? getString("_UI_IconType_type") : //$NON-NLS-1$
- getString("_UI_IconType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(IconType.class)) {
- case CommonPackage.ICON_TYPE__SMALL_ICON :
- case CommonPackage.ICON_TYPE__LARGE_ICON :
- case CommonPackage.ICON_TYPE__LANG : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java
deleted file mode 100644
index a9e139b..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java
+++ /dev/null
@@ -1,176 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.Identity}object.
- */
-public class IdentityItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public IdentityItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
- ;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Description", //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_of_the_identity_2"), //$NON-NLS-1$
- pkg.getIdentity_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- // This is for the roleName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Role Name", //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_role_name_property_of_the_identity_4"), //$NON-NLS-1$
- pkg.getIdentity_RoleName(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Identity_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Identity_description_feature", "_UI_Identity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getIdentity_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRoleNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Identity_roleName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Identity_roleName_feature", "_UI_Identity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getIdentity_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getIdentity_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the parent of the Identity.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns Identity.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("security_identity_obj");//$NON-NLS-1$
- }
-
- public String getText(Object object) {
- Identity identity = ((Identity) object);
- return "Identity " + identity.getRoleName(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Identity.class)) {
- case CommonPackage.IDENTITY__DESCRIPTION :
- case CommonPackage.IDENTITY__ROLE_NAME :
- case CommonPackage.IDENTITY__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getIdentity_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getIdentity_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java
deleted file mode 100644
index 9ac243d..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java
+++ /dev/null
@@ -1,190 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.JNDIEnvRefsGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class JNDIEnvRefsGroupItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JNDIEnvRefsGroupItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EnvironmentProperties());
- childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceRefs());
- childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs());
- childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceEnvRefs());
- childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs());
- childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_MessageDestinationRefs());
- childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ServiceRefs());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns JNDIEnvRefsGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/JNDIEnvRefsGroup"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((JNDIEnvRefsGroup) object).getDisplayName();
- return label == null || label.length() == 0 ? getString("_UI_JNDIEnvRefsGroup_type") : //$NON-NLS-1$
- getString("_UI_JNDIEnvRefsGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JNDIEnvRefsGroup.class)) {
- case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES :
- case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS :
- case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS :
- case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS :
- case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS :
- case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS :
- case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EnvironmentProperties(), CommonFactory.eINSTANCE.createEnvEntry()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceRefs(), CommonFactory.eINSTANCE.createResourceRef()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs(), CommonFactory.eINSTANCE.createEjbRef()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs(), CommonFactory.eINSTANCE.createEJBLocalRef()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceEnvRefs(), CommonFactory.eINSTANCE.createResourceEnvRef()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs(), CommonFactory.eINSTANCE.createEJBLocalRef()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_MessageDestinationRefs(), CommonFactory.eINSTANCE.createMessageDestinationRef()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java
deleted file mode 100644
index 86c3d02..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java
+++ /dev/null
@@ -1,122 +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.jst.j2ee.common.internal.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-public class ListenerItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ListenerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns Listener.gif
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("listener");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the Listener.
- */
- public Object getParent(Object object) {
- return WebapplicationPackage.eINSTANCE.getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- CommonPackage wap = CommonPackage.eINSTANCE;
-
- // This is for the listenerClass feature.
-
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "ListenerClass", CommonEditResourceHandler.getString("The_ListenerClass_property_2"), wap.getListener_ListenerClass(), false)); //$NON-NLS-1$ //$NON-NLS-2$
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Listener Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addListenerClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Listener_listenerClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Listener_listenerClass_feature", "_UI_Listener_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getListener_ListenerClass(), true));
- }
-
-
- public String getText(Object object) {
- Listener listener = (Listener) object;
- String name = listener.getListenerClassName();
- if (name == null)
- name = "<listener>"; //$NON-NLS-1$
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java
deleted file mode 100644
index c253268..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java
+++ /dev/null
@@ -1,133 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MessageDestinationItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MessageDestinationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDestination_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageDestination_name_feature", "_UI_MessageDestination_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getMessageDestination_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns MessageDestination.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/msgdrivendestination_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- */
- public String getText(Object object) {
- String md = CommonEditResourceHandler.getString("MessageDestination_UI_"); //$NON-NLS-1$
- String label = ((MessageDestination) object).getName();
- return label == null || label.length() == 0 ? md : md + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageDestination.class)) {
- case CommonPackage.MESSAGE_DESTINATION__NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java
deleted file mode 100644
index 76513c5..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java
+++ /dev/null
@@ -1,197 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MessageDestinationRefItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MessageDestinationRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addTypePropertyDescriptor(object);
- addUsagePropertyDescriptor(object);
- addLinkPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getMessageDestinationRef_Name(), true));
- }
-
- /**
- * This adds a property descriptor for the Type feature.
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getMessageDestinationRef_Type(), true));
- }
-
- /**
- * This adds a property descriptor for the Usage feature.
- */
- protected void addUsagePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Usage_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_usage_property_UI_"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getMessageDestinationRef_Usage(), true));
- }
-
- /**
- * This adds a property descriptor for the Link feature.
- */
- protected void addLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getMessageDestinationRef_Link(), true));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getMessageDestinationRef_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns MessageDestinationRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("message_bean_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((MessageDestinationRef) object).getName();
- return CommonEditResourceHandler.getString("MessageDestinationRefItemProvider_UI_0") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$, $NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageDestinationRef.class)) {
- case CommonPackage.MESSAGE_DESTINATION_REF__NAME :
- case CommonPackage.MESSAGE_DESTINATION_REF__TYPE :
- case CommonPackage.MESSAGE_DESTINATION_REF__USAGE :
- case CommonPackage.MESSAGE_DESTINATION_REF__LINK :
- case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getMessageDestinationRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getMessageDestinationRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object arg0) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java
deleted file mode 100644
index fea85b4..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java
+++ /dev/null
@@ -1,187 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ParamValueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ParamValueItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addValuePropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_ParamValue_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ParamValue_name_feature", "_UI_ParamValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getParamValue_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_ParamValue_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ParamValue_value_feature", "_UI_ParamValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getParamValue_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_ParamValue_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ParamValue_description_feature", "_UI_ParamValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getParamValue_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getParamValue_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns ParamValue.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("initializ_parameter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- public String getText(Object object) {
- String label = ((ParamValue) object).getName();
- return label == null || label.length() == 0 ? getString("_UI_ParamValue_type") : //$NON-NLS-1$
- getString("_UI_ParamValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ParamValue.class)) {
- case CommonPackage.PARAM_VALUE__NAME :
- case CommonPackage.PARAM_VALUE__VALUE :
- case CommonPackage.PARAM_VALUE__DESCRIPTION :
- case CommonPackage.PARAM_VALUE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getParamValue_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getParamValue_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java
deleted file mode 100644
index 8c7ec49..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java
+++ /dev/null
@@ -1,176 +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.jst.j2ee.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class QNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public QNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamespaceURIPropertyDescriptor(object);
- addLocalPartPropertyDescriptor(object);
- //addCombinedQNamePropertyDescriptor(object);
- //addInternalPrefixOrNsURIPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Namespace URI feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addNamespaceURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_QName_namespaceURI_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_QName_namespaceURI_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getQName_NamespaceURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Local Part feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addLocalPartPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_QName_localPart_feature"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("_UI_QName_localPart_feature_desc"), //$NON-NLS-1$
- CommonPackage.eINSTANCE.getQName_LocalPart(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Combined QName feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addCombinedQNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_QName_combinedQName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_QName_combinedQName_feature", "_UI_QName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getQName_CombinedQName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Internal Prefix Or Ns URI feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addInternalPrefixOrNsURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_QName_internalPrefixOrNsURI_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_QName_internalPrefixOrNsURI_feature", "_UI_QName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getQName_InternalPrefixOrNsURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns QName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("qname"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- */
- public String getText(Object object) {
- String label = CommonEditResourceHandler.getString("_UI_QName_type"); //$NON-NLS-1$
- if (((QName) object).getNamespaceURI() != null && (((QName) object).getLocalPart() != null)) {
- label = CommonEditResourceHandler.getString("_UI_QName_type") + " " + //$NON-NLS-1$ //$NON-NLS-2$
- ((QName) object).getNamespaceURI() + "#" + ((QName) object).getLocalPart(); //$NON-NLS-1$
- }
- return label;
-
-
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(QName.class)) {
- case CommonPackage.QNAME__NAMESPACE_URI :
- case CommonPackage.QNAME__LOCAL_PART :
- case CommonPackage.QNAME__COMBINED_QNAME :
- case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java
deleted file mode 100644
index b7680b5..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java
+++ /dev/null
@@ -1,202 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.ResourceRef}object.
- */
-public class ResourceEnvRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ResourceEnvRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns resource_reference.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("res_env_ref_obj"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the ResourceRef.
- */
- public Object getParent(Object object) {
- return object == null ? null : ((ResourceEnvRef) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
- pkg.getResourceEnvRef_Description(), true));
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
- pkg.getResourceEnvRef_Name(), true));
-
- // This is for the type feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
- pkg.getResourceEnvRef_Type(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceEnvRef_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceEnvRef_description_feature", "_UI_ResourceEnvRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceEnvRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceEnvRef_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceEnvRef_name_feature", "_UI_ResourceEnvRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceEnvRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceEnvRef_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceEnvRef_type_feature", "_UI_ResourceEnvRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceEnvRef_Type(), true));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getResourceEnvRef_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- return "ResourceEnvRef " + ((ResourceEnvRef) object).getName(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ResourceEnvRef.class)) {
- case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION :
- case CommonPackage.RESOURCE_ENV_REF__NAME :
- case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceEnvRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceEnvRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
- * enumeration, and this to check that enumeration, but we know there can't be any children, so
- * this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java
deleted file mode 100644
index 9d56418..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java
+++ /dev/null
@@ -1,281 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.ResourceRef}object.
- */
-public class ResourceRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ResourceRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns resource_reference.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("resource_reference"); //$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the ResourceRef.
- */
- public Object getParent(Object object) {
- return object == null ? null : ((ResourceRef) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
- ;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
- pkg.getResourceRef_Description()));
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
- pkg.getResourceRef_Name()));
-
- // This is for the type feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
- pkg.getResourceRef_Type(), false));
-
- // This is for the auth feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Auth_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_auth_property_UI_"), //$NON-NLS-1$
- pkg.getResourceRef_Auth()));
-
- // This is for the link feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
- * pkg.getResourceRef_Link()));
- */
-
- // This is for the client feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("Client_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_client_property_UI_"), //$NON-NLS-1$
- * pkg.getResourceRef_Client()));
- */
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
- * pkg.getResourceRef_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_description_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_name_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_type_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceRef_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Auth feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addAuthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_auth_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_auth_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceRef_Auth(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_link_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_link_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceRef_Link(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Res Sharing Scope feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addResSharingScopePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_resSharingScope_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_resSharingScope_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getResourceRef_ResSharingScope(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getResourceRef_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- return "ResourceRef " + ((ResourceRef) object).getName(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ResourceRef.class)) {
- case CommonPackage.RESOURCE_REF__DESCRIPTION :
- case CommonPackage.RESOURCE_REF__NAME :
- case CommonPackage.RESOURCE_REF__TYPE :
- case CommonPackage.RESOURCE_REF__AUTH :
- case CommonPackage.RESOURCE_REF__LINK :
- case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE :
- case CommonPackage.RESOURCE_REF__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
- * enumeration, and this to check that enumeration, but we know there can't be any children, so
- * this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java
deleted file mode 100644
index aac1e6f..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java
+++ /dev/null
@@ -1,136 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.RunAsSpecifiedIdentity}
- * object.
- */
-public class RunAsSpecifiedIdentityItemProvider extends SecurityIdentityItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public RunAsSpecifiedIdentityItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
-
- // This is for the identity feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Identity", //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_identity_of_the_run_as_specified_identity_2"), //$NON-NLS-1$
- pkg.getRunAsSpecifiedIdentity_Identity(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getRunAsSpecifiedIdentity_Identity());
- }
- return childrenReferences;
- }
-
- /**
- * This returns the parent of the RunAsSpecifiedIdentity.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns RunAsSpecifiedIdentity.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("security_identity_obj");//$NON-NLS-1$
- }
-
- public String getText(Object object) {
- RunAsSpecifiedIdentity runAsSpecifiedIdentity = ((RunAsSpecifiedIdentity) object);
- return "RunAsSpecifiedIdentity " + runAsSpecifiedIdentity.getDescription(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(RunAsSpecifiedIdentity.class)) {
- case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getRunAsSpecifiedIdentity_Identity(), CommonFactory.eINSTANCE.createIdentity()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java
deleted file mode 100644
index 05363da..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java
+++ /dev/null
@@ -1,160 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.SecurityIdentity}object.
- */
-public class SecurityIdentityItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SecurityIdentityItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
- ;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Description", //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_of_the_security_identity_2"), //$NON-NLS-1$
- pkg.getSecurityIdentity_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityIdentity_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityIdentity_description_feature", "_UI_SecurityIdentity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getSecurityIdentity_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getSecurityIdentity_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the parent of the SecurityIdentity.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns SecurityIdentity.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("environment_entity");//$NON-NLS-1$
- }
-
- public String getText(Object object) {
- SecurityIdentity securityIdentity = ((SecurityIdentity) object);
- return "SecurityIdentity " + securityIdentity.getDescription(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SecurityIdentity.class)) {
- case CommonPackage.SECURITY_IDENTITY__DESCRIPTION :
- case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityIdentity_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityIdentity_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java
deleted file mode 100644
index c510a5e..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java
+++ /dev/null
@@ -1,203 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.SecurityRole}object.
- */
-public class SecurityRoleItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SecurityRoleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns security_role.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("security_role");//$NON-NLS-1$
- }
-
- /**
- * This returns the parent of the SecurityRole.
- */
- public Object getParent(Object object) {
- return object == null ? null : ((SecurityRole) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
- pkg.getSecurityRole_Description()));
-
- // This is for the roleName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("RoleName_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_roleName_property_UI_"), //$NON-NLS-1$
- pkg.getSecurityRole_RoleName()));
-
- // This is for the application feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("Application_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_application_property_UI_"), //$NON-NLS-1$
- * pkg.getSecurityRole_Application()));
- */
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
- * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
- * pkg.getSecurityRole_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRole_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityRole_description_feature", "_UI_SecurityRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getSecurityRole_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRoleNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRole_roleName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityRole_roleName_feature", "_UI_SecurityRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getSecurityRole_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getSecurityRole_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- return " " + ((SecurityRole) object).getRoleName();//$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SecurityRole.class)) {
- case CommonPackage.SECURITY_ROLE__DESCRIPTION :
- case CommonPackage.SECURITY_ROLE__ROLE_NAME :
- case CommonPackage.SECURITY_ROLE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRole_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRole_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
- * enumeration, and this to check that enumeration, but we know there can't be any children, so
- * this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java
deleted file mode 100644
index 0d63afa..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java
+++ /dev/null
@@ -1,201 +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.jst.j2ee.common.internal.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.SecurityRoleRef}object.
- */
-public class SecurityRoleRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SecurityRoleRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns security_role_reference.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("security_role_reference");//$NON-NLS-1$
- }
-
- /**
- * This returns the servlet of the SecurityRoleRef.
- */
- public Object getParent(Object object) {
- return object == null ? null : ((SecurityRoleRef) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- CommonPackage pkg = CommonPackage.eINSTANCE;
-
- // This is for the name feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
- pkg.getSecurityRoleRef_Name()));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
- pkg.getSecurityRoleRef_Description()));
-
- // This is for the link feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
- CommonEditResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
- pkg.getSecurityRoleRef_Link(), false));
-
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRoleRef_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityRoleRef_name_feature", "_UI_SecurityRoleRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getSecurityRoleRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRoleRef_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityRoleRef_description_feature", "_UI_SecurityRoleRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getSecurityRoleRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRoleRef_link_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityRoleRef_link_feature", "_UI_SecurityRoleRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- CommonPackage.eINSTANCE.getSecurityRoleRef_Link(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(CommonPackage.eINSTANCE.getSecurityRoleRef_Descriptions());
- }
- return childrenReferences;
- }
-
-
- public String getText(Object object) {
- return "SecurityRoleRef " + ((SecurityRoleRef) object).getName();//$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SecurityRoleRef.class)) {
- case CommonPackage.SECURITY_ROLE_REF__NAME :
- case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION :
- case CommonPackage.SECURITY_ROLE_REF__LINK :
- case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRoleRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRoleRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
- * enumeration, and this to check that enumeration, but we know there can't be any children, so
- * this is faster.
- */
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/UseCallerIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/UseCallerIdentityItemProvider.java
deleted file mode 100644
index 28ab991..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/UseCallerIdentityItemProvider.java
+++ /dev/null
@@ -1,100 +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.jst.j2ee.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.UseCallerIdentity}object.
- */
-public class UseCallerIdentityItemProvider extends SecurityIdentityItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public UseCallerIdentityItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns the parent of the UseCallerIdentity.
- */
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }
-
- /**
- * This returns UseCallerIdentity.gif.
- */
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("security_identity_obj");//$NON-NLS-1$
- }
-
- public String getText(Object object) {
- UseCallerIdentity useCallerIdentity = ((UseCallerIdentity) object);
- return "UseCallerIdentity " + useCallerIdentity.getDescription(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/CommonEditResourceHandler.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/CommonEditResourceHandler.java
deleted file mode 100644
index b2e308b..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/CommonEditResourceHandler.java
+++ /dev/null
@@ -1,63 +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.jst.j2ee.internal.common;
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class CommonEditResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("commonedit");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IJ2EECommonConstants.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IJ2EECommonConstants.java
deleted file mode 100644
index d6e6f4b..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IJ2EECommonConstants.java
+++ /dev/null
@@ -1,35 +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.jst.j2ee.internal.common;
-
-
-/**
- * @author jialin
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- */
-public interface IJ2EECommonConstants {
-
- //J2EE Preferences
- // J2EE_NAVIGATOR_LINKING_PREFERENCE specifies whether the J2EE Navigator
- // selection should be linked to the active editor.
- // It is a boolean value, and the default is true.
- final static String J2EE_NAVIGATOR_LINKING_PREFERENCE = "org.eclipse.jst.j2ee.internal.internal.ui.preference.j2eeNavigatorLinking"; //$NON-NLS-1$
- final static String J2EE_VERSION_PREFERENCE = "org.eclipse.jst.j2ee.internal.internal.ui.preference.j2eeVersion";//$NON-NLS-1$
- final static String J2EE_VERSION_1_2 = "J2EE_1_2"; //$NON-NLS-1$
- final static String J2EE_VERSION_1_3 = "J2EE_1_3"; //$NON-NLS-1$
-
- final static String J2EE_VERSION_PREF_LABEL = CommonEditResourceHandler.getString("Select_the_highest_J2EE_version_that_is_to_be_used__UI_"); //$NON-NLS-1$
-
- final static String SAVE_ON_BINARY_PROJECT_TITLE = CommonEditResourceHandler.getString("SAVE_ON_BINARY_PROJECT_TITLE_UI_"); //$NON-NLS-1$
- final static String SAVE_ON_BINARY_PROJECT_MESSAGE = CommonEditResourceHandler.getString("SAVE_ON_BINARY_PROJECT_MESSAGE_UI_"); //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IStructuredTextEditingDomain.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IStructuredTextEditingDomain.java
deleted file mode 100644
index b2f9882..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IStructuredTextEditingDomain.java
+++ /dev/null
@@ -1,43 +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.jst.j2ee.internal.common;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.wst.sse.core.internal.undo.IStructuredTextUndoManager;
-
-/**
- * This is a specialized editing domain that can be used by editors that have one or more design
- * pages that view a MOF model and a source page that contains an XML Model.
- */
-public interface IStructuredTextEditingDomain extends EditingDomain {
- /**
- * Execute a command within the editing domain.
- */
- public void execute(Command command);
-
- /**
- * Execute a command within the editing domain
- */
- public void execute(String label, Command command);
-
- /**
- * This returns the adapter factory used by this domain.
- */
- public AdapterFactory getAdapterFactory();
-
- public IStructuredTextUndoManager getUndoManager();
-
- public void setUndoManager(IStructuredTextUndoManager newUndoManager);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java
deleted file mode 100644
index ff54dbe..0000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java
+++ /dev/null
@@ -1,88 +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.jst.j2ee.internal.common;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.wst.sse.core.internal.undo.IStructuredTextUndoManager;
-
-/**
- * This is a specialized editing domain that can be used by editors that have one or more design
- * pages that view a MOF model and a source page that contains an XML Model.
- */
-public class StructuredTextEditingDomain extends AdapterFactoryEditingDomain implements IStructuredTextEditingDomain {
- protected IStructuredTextUndoManager undoManager;
-
- /**
- * StructuredTextEditingDomain constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- * @param commandStack
- * CommandStack
- */
- public StructuredTextEditingDomain(AdapterFactory adapterFactory, CommandStack commandStack) {
- super(adapterFactory, commandStack);
- }
-
- public StructuredTextEditingDomain(AdapterFactory adapterFactory, CommandStack commandStack, ResourceSet resourceSet) {
- super(adapterFactory, commandStack, resourceSet);
- }
-
- /**
- * Execute a command within the editing domain.
- */
- public void execute(Command command) {
- execute(command.getLabel(), command);
- }
-
- /**
- * Execute a command within the editing domain.
- */
- public void execute(String label, Command command) {
- executeViaUndoManager(label, command);
- }
-
- /**
- * Execute a command directly on the command stack
- */
- public void executeViaStack(Command command) {
- getCommandStack().execute(command);
- }
-
- /**
- * Execute a command within the editing domain.
- */
- public void executeViaUndoManager(String label, Command command) {
- if (command.canExecute()) {
- if (undoManager != null) {
- undoManager.beginRecording(this, label);
- command.execute();
- undoManager.endRecording(this);
- } else
- executeViaStack(command);
- }
- }
-
- public IStructuredTextUndoManager getUndoManager() {
- return undoManager;
- }
-
- public void setUndoManager(IStructuredTextUndoManager newUndoManager) {
- undoManager = newUndoManager;
- undoManager.setCommandStack(commandStack);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/component.xml b/plugins/org.eclipse.jst.j2ee/component.xml
deleted file mode 100644
index 39d5499..0000000
--- a/plugins/org.eclipse.jst.j2ee/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.jst.j2ee"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee" fragment="false"/><plugin id="org.eclipse.jst.j2ee.navigator.ui" fragment="false"/><plugin id="org.eclipse.jst.j2ee.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java
deleted file mode 100644
index 6ae6c75..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.application.internal.operations;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class AddComponentToEnterpriseApplicationDataModelProvider extends CreateReferenceComponentsDataModelProvider implements IAddComponentToEnterpriseApplicationDataModelProperties {
-
- public AddComponentToEnterpriseApplicationDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(TARGET_COMPONENTS_TO_URI_MAP);
- return propertyNames;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new AddComponentToEnterpriseApplicationOp(model);
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
- final Map map = new HashMap();
- final List components = (List) getProperty(TARGET_COMPONENT_LIST);
- for (int i = 0; i < components.size(); i++) {
- final IVirtualComponent component = (IVirtualComponent) components.get(i);
- map.put(component, getComponentURI(component));
- }
- return map;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- /**
- * Return the component URI for the specified IVirtualComponent.
- */
- public static String getComponentURI(final IVirtualComponent component) {
- final IProject project = component.getProject();
- String name = component.getName();
-
- if (J2EEProjectUtilities.isDynamicWebProject(project)) {
- name += ".war"; //$NON-NLS-1$
- } else if (J2EEProjectUtilities.isEJBProject(project)) {
- name += ".jar"; //$NON-NLS-1$
- } else if (J2EEProjectUtilities.isApplicationClientProject(project)) {
- name += ".jar"; //$NON-NLS-1$
- } else if (J2EEProjectUtilities.isJCAProject(project)) {
- name += ".rar"; //$NON-NLS-1$
- }
- return name;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
deleted file mode 100644
index 137676d..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.application.internal.operations;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-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.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsOp;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AddComponentToEnterpriseApplicationOp extends CreateReferenceComponentsOp {
- public static final String metaInfFolderDeployPath = "/"; //$NON-NLS-1$
-
- public AddComponentToEnterpriseApplicationOp(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 3 );
- }
-
- try
- {
- super.execute( submon( monitor, 1 ), info );
- updateEARDD( submon( monitor, 1 ) );
- updateModuleRuntimes( submon( monitor, 1 ) );
-
- return OK_STATUS;
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
- protected void updateEARDD(IProgressMonitor monitor) {
-
- EARArtifactEdit earEdit = null;
- StructureEdit se = null;
- try {
- IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
- //TEMP workaround for use during ear creation before facet is added, this should be reverted when 115924 is fixed.
- earEdit = new EARArtifactEdit(sourceComp.getProject(), false, true);
- //earEdit = EARArtifactEdit.getEARArtifactEditForWrite(sourceComp.getProject());
- se = StructureEdit.getStructureEditForWrite(sourceComp.getProject());
- if (earEdit != null) {
- Application application = earEdit.getApplication();
- List list = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- Map map = (Map) model.getProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP);
- if (list != null && list.size() > 0) {
- for (int i = 0; i < list.size(); i++) {
- StructureEdit compse = null;
- IVirtualComponent wc = (IVirtualComponent) list.get(i);
- WorkbenchComponent earwc = se.getComponent();
- try {
- compse = StructureEdit.getStructureEditForWrite(wc.getProject());
- WorkbenchComponent refwc = compse.getComponent();
- ReferencedComponent ref = se.findReferencedComponent(earwc, refwc);
- Module mod = addModule(application, wc, (String) map.get(wc));
- ref.setDependentObject(mod);
- } finally {
- if (compse != null) {
- compse.saveIfNecessary(monitor);
- compse.dispose();
- }
- }
- }
- }
- }
- se.saveIfNecessary(monitor);
- earEdit.saveIfNecessary(monitor);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (earEdit != null)
- earEdit.dispose();
- if (se != null)
- se.dispose();
- }
- }
-
- protected Module createNewModule(IVirtualComponent wc) {
- if (J2EEProjectUtilities.isDynamicWebProject(wc.getProject())) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createWebModule();
- } else if (J2EEProjectUtilities.isEJBProject(wc.getProject())) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createEjbModule();
- } else if (J2EEProjectUtilities.isApplicationClientProject(wc.getProject())) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createJavaClientModule();
- } else if (J2EEProjectUtilities.isJCAProject(wc.getProject())) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createConnectorModule();
- }
- return null;
- }
-
- protected Module addModule(Application application, IVirtualComponent wc, String name) {
- Application dd = application;
- Module existingModule = dd.getFirstModule(name);
-
- if (existingModule == null) {
- existingModule = createNewModule(wc);
- if (existingModule != null) {
- existingModule.setUri(name);
- if (existingModule instanceof WebModule) {
- Properties props = wc.getMetaProperties();
- String contextroot = ""; //$NON-NLS-1$
- if ((props != null) && (props.containsKey(J2EEConstants.CONTEXTROOT)))
- contextroot = props.getProperty(J2EEConstants.CONTEXTROOT);
- ((WebModule) existingModule).setContextRoot(contextroot);
- }
- dd.getModules().add(existingModule);
- }
- }
- return existingModule;
- }
-
- private void updateModuleRuntimes( final IProgressMonitor monitor )
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 10 );
- }
-
- try
- {
- final IVirtualComponent ear
- = (IVirtualComponent) this.model.getProperty( ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT );
-
- final IProject earpj = ear.getProject();
-
- final List moduleComponents
- = (List) this.model.getProperty( ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST );
-
- final Set moduleProjects = new HashSet();
-
- for( Iterator itr = moduleComponents.iterator(); itr.hasNext(); )
- {
- moduleProjects.add( ( (IVirtualComponent) itr.next() ).getProject() );
- }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
-
- EarFacetRuntimeHandler.updateModuleProjectRuntime( earpj, moduleProjects,
- submon( monitor, 9 ) );
- }
- catch( Exception e )
- {
- Logger.getLogger().logError( e );
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
- private static IProgressMonitor submon( final IProgressMonitor parent,
- final int ticks )
- {
- return ( parent == null ? null : new SubProgressMonitor( parent, ticks ) );
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebComponentToEARDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebComponentToEARDataModelProvider.java
deleted file mode 100644
index f81af61..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebComponentToEARDataModelProvider.java
+++ /dev/null
@@ -1,103 +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.jst.j2ee.application.internal.operations;
-
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- *
- */
-public class AddWebComponentToEARDataModelProvider extends AddComponentToEnterpriseApplicationDataModelProvider implements IAddWebComponentToEnterpriseApplicationDataModelProperties {
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(CONTEXT_ROOT);
- return propertyNames;
- }
-
- /**
- *
- */
- protected String getDefaultURIExtension() {
- return "war"; //$NON-NLS-1$
- }
-
- /**
- *
- */
- public boolean isWebModuleArchive() {
- return true;
- }
-
- /**
- *
- */
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean notify = super.propertySet(propertyName, propertyValue);
- if (notify && propertyName.equals(CONTEXT_ROOT))
- model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.DEFAULT_CHG);
- return notify;
- }
-
- /**
- *
- */
- public Object getDefaultProperty(String propertyName) {
- // if (propertyName.equals(CONTEXT_ROOT))
- // return getDefaultContextRoot();
- return super.getDefaultProperty(propertyName);
- }
-
-
- /**
- *
- */
- public IStatus validate(String propertyName) {
- if (CONTEXT_ROOT.equals(propertyName)) {
- return validateContextRoot(getStringProperty(CONTEXT_ROOT));
- }
- return super.validate(propertyName);
- }
-
- /**
- *
- * @param contextRoot
- * @return
- */
- public IStatus validateContextRoot(String contextRoot) {
- if (contextRoot.equals("") || contextRoot == null) { //$NON-NLS-1$
- return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2, new Object[]{contextRoot}), null);
- } else if (contextRoot.trim().equals(contextRoot)) {
- StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
- 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) {
- Object[] invalidChar = new Object[]{(new Character(token.charAt(i))).toString()};
- String errorStatus = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar);
- return J2EEPlugin.newErrorStatus(errorStatus, null);
- }
- }
- }
- } else
- return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Names_cannot_begin_or_end_with_whitespace_5, new Object[]{contextRoot}), null);
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientComponentExportDataModelProvider.java
deleted file mode 100644
index 8b23858..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,71 +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.jst.j2ee.application.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class AppClientComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider {
-
- public AppClientComponentExportDataModelProvider() {
- super();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new AppClientComponentExportOperation(model);
- }
-
- protected String getModuleExtension() {
- return ".jar"; //$NON-NLS-1$
- }
-
- protected String getWrongComponentTypeString(String projectName) {
- return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_AN_APP_CLIENT, new Object[]{projectName});
- }
-
- protected String getProjectType() {
- return J2EEProjectUtilities.APPLICATION_CLIENT;
- }
- /**
- * Exports the specified Application Client Module project to the specified Application Client
- * Jar file.
- *
- * @param appClientProjectName
- * The name of the Application Client Module project to export.
- * @param appClientJarFileName
- * The fully qualified Application Client Jar file location to export the specified
- * Application Client Module project.
- * @param overwriteExisting
- * If this is <code>true</code> then an existing file at the location specified by
- * <code>earFileName</code> will be overwritten.
- * @param exportSource
- * If this is <code>true</code> then all source files in the specified Application
- * Client Module will be included in the resulting Application Client Jar file.
- * @plannedfor WTP 1.0
- */
-// public static void exportProject(String appClientProjectName, String appClientJarFileName, boolean overwriteExisting, boolean exportSource) {
-// AppClientModuleExportDataModel dataModel = new AppClientModuleExportDataModel();
-// dataModel.setProperty(PROJECT_NAME, appClientProjectName);
-// dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-// dataModel.setProperty(ARCHIVE_DESTINATION, appClientJarFileName);
-// dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-// try {
-// dataModel.getDefaultOperation().run(null);
-// } catch (InvocationTargetException e) {
-// Logger.getLogger().logError(e);
-// } catch (InterruptedException e) {
-// Logger.getLogger().logError(e);
-// }
-// }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
deleted file mode 100644
index ea04d41..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
+++ /dev/null
@@ -1,861 +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.jst.j2ee.application.internal.operations;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ManifestException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-
-
-public class ClassPathSelection {
- protected Archive archive;
- protected IProject earProject;
- protected IVirtualComponent earComponent;
- protected List classpathElements;
- protected Map urisToElements;
- protected boolean modified;
- private String targetProjectName;
- protected Map ejbToClientJARs = null;
- protected Map clientToEJBJARs = null;
- public static final int FILTER_EJB_SERVER_JARS = 0;
- public static final int FILTER_EJB_CLIENT_JARS = 1;
- public static final int FILTER_NONE = 2;
-
- protected int filterLevel = 2;
-
- protected static Comparator comparator = new Comparator() {
- /**
- * @see Comparator#compare(Object, Object)
- */
- public int compare(Object o1, Object o2) {
- Archive a1 = (Archive) o1;
- Archive a2 = (Archive) o2;
- return a1.getURI().compareTo(a2.getURI());
- }
- };
-
- public ClassPathSelection(Archive anArchive, String targetProjectName, EARFile earFile) {
- super();
- archive = anArchive;
- this.targetProjectName = targetProjectName;
- initializeEARProject(earFile);
- initializeElements();
- }
-
- /**
- * ClassPathSelection constructor comment.
- */
- public ClassPathSelection(Archive anArchive, EARFile earFile) {
- super();
- archive = anArchive;
- initializeEARProject(earFile);
- initializeElements();
- }
-
- /**
- * ClassPathSelection constructor comment.
- */
- public ClassPathSelection() {
- super();
- }
-
- protected ClasspathElement createElement(Archive referencingArchive, Archive referencedArchive, String cpEntry) {
- ClasspathElement element = new ClasspathElement(referencingArchive);
- element.setValid(true);
-
- String uriString = referencedArchive.getURI();
- URI uri = URI.createURI(uriString);
-
- boolean hasAbsolutePath = uri.hasAbsolutePath();
- if( hasAbsolutePath ){
- uriString = uri.lastSegment();
- }
-
- //element.setText(referencedArchive.getURI());
- element.setText(uriString);
- element.setTargetArchive(referencedArchive);
- element.setEarProject(earProject);
- if( earComponent != null ){
- IContainer earConentFolder = earComponent.getRootFolder().getUnderlyingFolder();
- if( earConentFolder.getType() == IResource.FOLDER ){
- element.setEarContentFolder( earConentFolder.getName());
- }else {
- element.setEarContentFolder( "" );
- }
- }
-
- setProjectValues(element, referencedArchive);
- if (cpEntry != null)
- element.setValuesSelected(cpEntry);
- setType(element, referencedArchive);
- return element;
- }
-
- protected ClasspathElement createInvalidElement(String cpEntry) {
- ClasspathElement element = new ClasspathElement(archive);
- element.setValid(false);
- element.setSelected(true);
- element.setRelativeText(cpEntry);
- element.setText(cpEntry);
- element.setEarProject(earProject);
- setInvalidProject(element);
- return element;
- }
-
- public ClasspathElement createProjectElement(IProject project) {
- ClasspathElement element = new ClasspathElement(project);
- element.setValid(true);
- element.setSelected(true);
- element.setText(project.getName());
- element.setProject(project);
- addClasspathElement(element,element.getProjectName());
- return element;
- }
-
- public ClasspathElement createProjectElement(IProject project, boolean existingEntry ) {
- ClasspathElement element = new ClasspathElement(project);
- element.setValid(true);
- element.setSelected(existingEntry);
- element.setText(project.getName());
- element.setProject(project);
- addClasspathElement(element,element.getProjectName());
- return element;
- }
-
-
- public ClasspathElement createArchiveElement(URI uri, String name, String cpEntry) {
- ClasspathElement element = new ClasspathElement(uri);
- element.setValid(false);
- element.setRelativeText(name);
- if (cpEntry != null)
- element.setValuesSelected(cpEntry);
- element.setText(name);
- element.setEarProject(earProject);
- return element;
- }
-
- /**
- * @param element
- */
- private void setInvalidProject(ClasspathElement element) {
- IProject earProj = element.getEarProject();
- //IVirtualComponent[] component = ComponentUtilities.getComponent(earProj.getName());
- IVirtualComponent component = ComponentUtilities.getComponent(earProj.getName());
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(component);
- if (edit != null) {
- String moduleName = element.getRelativeText();
- if(moduleName != null) {
- IVirtualComponent modComponent = edit.getModule(moduleName);
- if(modComponent != null) {
- IProject mappedProject = modComponent.getProject();
- element.setProject(mappedProject);
- }
- }
- }
- } finally {
- if(edit != null) {
- edit.dispose();
- edit = null;
- }
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 1:17:21 PM)
- *
- * @return java.util.List
- */
- public java.util.List getClasspathElements() {
- if(classpathElements == null)
- classpathElements = new ArrayList();
- return classpathElements;
- }
-
- public java.util.List getSelectedClasspathElements() {
- ArrayList list = new ArrayList();
- Iterator it = getClasspathElements().iterator();
- while(it.hasNext()) {
- ClasspathElement element = (ClasspathElement)it.next();
- if( element.isSelected() ){
- list.add(element);
- }
- }
- return list;
- }
-
- /**
- * Adapter method to convert the manifest class path entries which map to a project to a list of
- * classpath entries for a java build path
- */
- protected IClasspathEntry[] getClasspathEntries(boolean filterSelected) {
- List result = new ArrayList();
- IClasspathEntry[] array = null;
- ClasspathElement element = null;
- if(classpathElements != null) {
- for (int i = 0; i < classpathElements.size(); i++) {
- element = (ClasspathElement) classpathElements.get(i);
- if (filterSelected && !element.isSelected())
- continue;
- array = ((ClasspathElement) classpathElements.get(i)).newClasspathEntries();
- if (array == null)
- continue;
- for (int j = 0; j < array.length; j++) {
- if (!result.contains(array[j]))
- result.add(array[j]);
- }
- }
- return (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
- }
- return null;
- }
-
- /**
- * Adapter method to convert the manifest class path entries which map to a project to a list of
- * classpath entries for a java build path
- */
- public IClasspathEntry[] getClasspathEntriesForAll() {
- return getClasspathEntries(false);
- }
-
- /**
- * Adapter method to convert the manifest class path entries which map to a project to a list of
- * classpath entries for a java build path
- */
- public IClasspathEntry[] getClasspathEntriesForSelected() {
- return getClasspathEntries(true);
- }
-
- protected EARFile getEARFile() {
- if (archive == null)
- return null;
-
- Container parent = archive.getContainer();
- if (parent != null && parent.isEARFile())
- return (EARFile) parent;
- return null;
- }
-
- protected static IProject getEARProject(Archive anArchive) {
- Container c = anArchive.getContainer();
- if (!c.isEARFile())
- return null;
- EARFile ear = (EARFile) c;
- LoadStrategy loader = ear.getLoadStrategy();
- if (!(loader instanceof EARComponentLoadStrategyImpl))
- return null;
-
- return ((EARComponentLoadStrategyImpl) loader).getComponent().getProject();
- }
-
- public Archive getArchive() {
- return archive;
- }
-
- protected IProject getProject(Archive anArchive) {
- LoadStrategy loader = anArchive.getLoadStrategy();
- if (loader instanceof ComponentLoadStrategyImpl)
- return ((ComponentLoadStrategyImpl) loader).getComponent().getProject();
- return null;
- }
-
- public String getText() {
- return archive.getURI();
- }
-
- protected Archive getArchive(String uri, List archives) {
- for (int i = 0; i < archives.size(); i++) {
- Archive anArchive = (Archive) archives.get(i);
-
- String archiveURIString = anArchive.getURI();
- URI archiveURI = URI.createURI(archiveURIString);
- boolean hasAbsolutePath = archiveURI.hasAbsolutePath();
- if( hasAbsolutePath ){
- archiveURIString = archiveURI.lastSegment();
- }
- if (archiveURIString.equals(uri))
- return anArchive;
- }
- return null;
- }
-
- protected void initializeElements() {
- ejbToClientJARs = J2EEProjectUtilities.collectEJBClientJARs(getEARFile());
- clientToEJBJARs = reverse(ejbToClientJARs);
- classpathElements = new ArrayList();
- urisToElements = new HashMap();
- String[] cp = new String[0];
- try {
- cp = archive.getManifest().getClassPathTokenized();
- } catch (ManifestException ex) {
- Logger.getLogger().logError(ex);
- }
- List archives = getEARFile().getArchiveFiles();
- Archive other = null;
- ClasspathElement element = null;
- for (int i = 0; i < cp.length; i++) {
- String cpEntry = cp[i];
- String uri = ArchiveUtil.deriveEARRelativeURI(cpEntry, archive);
- other = getArchive(uri, archives);
- if (other != null && ArchiveUtil.isValidDependency(other, archive)) {
- element = createElement(archive, other, cpEntry);
- archives.remove(other);
- } else {
- element = createInvalidElement(cpEntry);
- if (element.representsImportedJar()) {
- element.setValid(true);
- element.setProject(getProject(archive));
- }
- if (other != null)
- element.setProject(getProject(other));
- }
- addClasspathElement(element, uri);
- }
- Collections.sort(archives, comparator);
- //Anything that remains in the list of available archives that is valid should be
- //available for selection
- for (int i = 0; i < archives.size(); i++) {
- other = (Archive) archives.get(i);
- if (other != archive && ArchiveUtil.isValidDependency(other, archive)) {
- IProject project = getProject(other);
- if (null == targetProjectName || null == project || !project.getName().equals(targetProjectName)) {
- element = createElement(archive, other, null);
- element.setProject(getProject(other));
- addClasspathElement(element, other.getURI());
- }
- }
- }
-
- if( earComponent!= null){
- IVirtualReference[] newrefs = earComponent.getReferences();
- for( int i=0; i < newrefs.length; i++){
- IVirtualReference ref = newrefs[i];
- IVirtualComponent referencedComponent = ref.getReferencedComponent();
- boolean isBinary = referencedComponent.isBinary();
- if( isBinary ){
- /**
- * Warning clean-up 12/05/2005
- */
- //String uri = J2EEProjectUtilities.getResolvedPathForArchiveComponent(referencedComponent.getName()).toString();
- String unresolvedURI = "";
- try {
- unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)));
- } catch (UnresolveableURIException e) {
- e.printStackTrace();
- }
- URI archiveURI = URI.createURI(unresolvedURI);
-
- boolean alreadyInList = false;
- Iterator iter = getClasspathElements().iterator();
- while(iter.hasNext()){
- ClasspathElement tmpelement = (ClasspathElement)iter.next();
- if( tmpelement.getText().equals(archiveURI.lastSegment())){
- alreadyInList = true;
- break;
- }
- }
-
- if( !alreadyInList ){
- if( inManifest(cp, archiveURI.lastSegment())){
- element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), archiveURI.lastSegment());
- addClasspathElement(element, unresolvedURI);
- }else{
- element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), null);
- addClasspathElement(element, unresolvedURI);
- }
- }
- }
- }
- }
- }
-
- boolean inManifest(String[] cp, String archiveName ){
- boolean result = false;
- String cpEntry = "";
- for (int i = 0; i < cp.length; i++) {
- cpEntry = cp[i];
- if( archiveName.equals(cpEntry)){
- result = true;
- }
- }
- return result;
- }
-
- protected List loadClassPathArchives(){
- /**
- * Warning clean-up 12/05/2005
- */
- //LoadStrategy loadStrat = archive.getLoadStrategy();
-
- List archives = new ArrayList();
-
- if( earComponent!= null){
- IVirtualReference[] newrefs = earComponent.getReferences();
- for( int i=0; i < newrefs.length; i++){
- IVirtualReference ref = newrefs[i];
- IVirtualComponent referencedComponent = ref.getReferencedComponent();
- boolean isBinary = referencedComponent.isBinary();
-
- if( isBinary ){
- String uri = J2EEProjectUtilities.getResolvedPathForArchiveComponent(referencedComponent.getName()).toString();
-
- try {
- ZipFileLoadStrategyImpl strat = createLoadStrategy(uri);
- Archive archive = null;
- try {
- archive = CommonarchiveFactoryImpl.getActiveFactory().primOpenArchive(strat, uri);
- } catch (OpenFailureException e) {
- // TODO Auto-generated catch block
- Logger.getLogger().logError(e);
- }
-
- archives.add(archive);
-
- } catch (FileNotFoundException e) {
- Logger.getLogger().logError(e);
- } catch (IOException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- }
- }
- return archives;
- }
-
- Archive getClassPathArchive(String uri, List archives){
- for (int i = 0; i < archives.size(); i++) {
- Archive anArchive = (Archive) archives.get(i);
-
- String archiveURIString = anArchive.getURI();
- URI archiveURI = URI.createURI(archiveURIString);
- boolean hasAbsolutePath = archiveURI.hasAbsolutePath();
- if( hasAbsolutePath ){
- archiveURIString = archiveURI.lastSegment();
- }
- if (archiveURIString.equals(uri))
- return anArchive;
- }
- return null;
- }
-
- boolean isClassPathArchive(String uri, List archives){
- for (int i = 0; i < archives.size(); i++) {
- Archive anArchive = (Archive) archives.get(i);
-
- String archiveURIString = anArchive.getURI();
- URI archiveURI = URI.createURI(archiveURIString);
- /**
- * Warning clean-up 12/05/2005
- */
- //boolean hasAbsolutePath = archiveURI.hasAbsolutePath();
- if( archiveURI.lastSegment().equals(uri) ){
- return true;
- }
- }
- return false;
- }
-
- public ZipFileLoadStrategyImpl createLoadStrategy(String uri) throws FileNotFoundException, IOException {
- String filename = uri.replace('/', java.io.File.separatorChar);
- java.io.File file = new java.io.File(filename);
- if (!file.exists()) {
- throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // = "URI Name: {0}; File name: {1}"
- }
- if (file.isDirectory()) {
- throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // = "URI Name: {0}; File name: {1}"
- }
- return new org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl(file);
- }
-
-
- private void initializeEARProject(EARFile earFile) {
- LoadStrategy loadStrat = earFile.getLoadStrategy();
- if (loadStrat instanceof EARComponentLoadStrategyImpl){
- earComponent = ((EARComponentLoadStrategyImpl) loadStrat).getComponent();
- earProject = ((EARComponentLoadStrategyImpl) loadStrat).getComponent().getProject();
- }
- }
-
- private void setType(ClasspathElement element, Archive other) {
- if (other == null)
- return;
- else if (clientToEJBJARs.containsKey(other))
- element.setJarType(ClasspathElement.EJB_CLIENT_JAR);
- else if (other.isEJBJarFile())
- element.setJarType(ClasspathElement.EJB_JAR);
- }
-
- /**
- * @param localejbToClientJARs
- * @return
- */
- private Map reverse(Map localejbToClientJARs) {
- if (localejbToClientJARs == null || localejbToClientJARs.isEmpty())
- return Collections.EMPTY_MAP;
- Map result = new HashMap();
- Iterator iter = localejbToClientJARs.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- result.put(entry.getValue(), entry.getKey());
- }
- return result;
- }
-
- public void addClasspathElement(ClasspathElement element, String uri) {
- getClasspathElements().add(element);
- getUrisToElements().put(uri, element);
- element.setParentSelection(this);
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 6:05:11 PM)
- *
- * @return boolean
- */
- public boolean isModified() {
- return modified;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 6:05:11 PM)
- *
- * @param newModified
- * boolean
- */
- public void setModified(boolean newModified) {
- modified = newModified;
- }
-
- protected void setProjectValues(ClasspathElement element, Archive referencedArchive) {
- IProject p = getProject(referencedArchive);
- if (p == null)
- return;
-
- element.setProject(p);
- //Handle the imported jars in the project
- String[] cp = null;
- try {
- cp = referencedArchive.getManifest().getClassPathTokenized();
- } catch (ManifestException mfEx) {
- Logger.getLogger().logError(mfEx);
- cp = new String[]{};
- }
- List paths = new ArrayList(cp.length);
- for (int i = 0; i < cp.length; i++) {
-
- IFile file = null;
- try {
- file = p.getFile(cp[i]);
- } catch (IllegalArgumentException invalidPath) {
- continue;
- }
- if (file.exists())
- paths.add(file.getFullPath());
- }
- if (!paths.isEmpty())
- element.setImportedJarPaths(paths);
- }
-
- public String toString() {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < classpathElements.size(); i++) {
- ClasspathElement element = (ClasspathElement) classpathElements.get(i);
- if (element.isSelected()) {
- sb.append(element.getRelativeText());
- sb.append(" "); //$NON-NLS-1$
- }
- }
- //Remove the trailing space
- if (sb.length() > 0)
- sb.deleteCharAt(sb.length() - 1);
- return sb.toString();
- }
-
- public void setAllSelected(boolean selected) {
- setAllSelected(classpathElements, selected);
- }
-
- public void setAllSelected(List elements, boolean selected) {
- for (int i = 0; i < elements.size(); i++) {
- ClasspathElement elmt = (ClasspathElement) elements.get(i);
- elmt.setSelected(selected);
- }
- }
-
- /* borrowed code from jdt */
- protected List moveUp(List elements, List move) {
- int nElements = elements.size();
- List res = new ArrayList(nElements);
- Object floating = null;
- for (int i = 0; i < nElements; i++) {
- Object curr = elements.get(i);
- if (move.contains(curr)) {
- res.add(curr);
- } else {
- if (floating != null) {
- res.add(floating);
- }
- floating = curr;
- }
- }
- if (floating != null) {
- res.add(floating);
- }
- return res;
- }
-
- /* borrowed code from jdt */
- public void moveUp(List toMoveUp) {
- setModifiedIfAnySelected(toMoveUp);
- if (toMoveUp.size() > 0)
- classpathElements = moveUp(classpathElements, toMoveUp);
- }
-
- /* borrowed code from jdt */
- public void moveDown(List toMoveDown) {
- setModifiedIfAnySelected(toMoveDown);
- if (toMoveDown.size() > 0)
- classpathElements = reverse(moveUp(reverse(classpathElements), toMoveDown));
-
- }
-
- /* borrowed code from jdt */
- protected List reverse(List p) {
- List reverse = new ArrayList(p.size());
- for (int i = p.size() - 1; i >= 0; i--) {
- reverse.add(p.get(i));
- }
- return reverse;
- }
-
- public ClasspathElement getClasspathElement(String uri) {
- if (urisToElements == null)
- return null;
- return (ClasspathElement) urisToElements.get(uri);
- }
-
- public ClasspathElement getClasspathElement(IProject archiveProject) {
- if (archiveProject != null) {
- for (int i = 0; i < classpathElements.size(); i++) {
- ClasspathElement elmnt = (ClasspathElement) classpathElements.get(i);
- if (archiveProject.equals(elmnt.getProject()))
- return elmnt;
- }
- }
- return null;
- }
-
- public boolean hasDirectOrIndirectDependencyTo(IProject archiveProject) {
- ClasspathElement element = getClasspathElement(archiveProject);
- if (element == null)
- return false;
- Archive anArchive = null;
- if (element.isValid()) {
- try {
- anArchive = (Archive) getEARFile().getFile(element.getText());
- } catch (FileNotFoundException e) {
- }
- }
- return anArchive != null && archive.hasClasspathVisibilityTo(anArchive);
- }
-
- public boolean hasDirectOrIndirectDependencyTo(String jarName) {
- ClasspathElement element = getClasspathElement(jarName);
- if (element == null)
- return false;
- Archive anArchive = null;
- if (element.isValid()) {
- try {
- anArchive = (Archive) getEARFile().getFile(element.getText());
- } catch (FileNotFoundException e) {
- }
- }
- return anArchive != null && archive.hasClasspathVisibilityTo(anArchive);
- }
-
-
- public boolean isAnyJarSelected(int type) {
- if (classpathElements != null) {
- for (int i = 0; i < classpathElements.size(); i++) {
- ClasspathElement element = (ClasspathElement) classpathElements.get(i);
- if (element.getJarType() == type && element.isSelected())
- return true;
- }
- }
- return false;
- }
-
-
- public boolean isAnyEJBJarSelected() {
- return isAnyJarSelected(ClasspathElement.EJB_JAR);
- }
-
-
-
- public boolean isAnyEJBClientJARSelected() {
- return isAnyJarSelected(ClasspathElement.EJB_CLIENT_JAR);
-
- }
-
- /**
- * @return
- */
- public int getFilterLevel() {
- return filterLevel;
- }
-
- /**
- * @param i
- */
- public void setFilterLevel(int i) {
- filterLevel = i;
- }
-
- /**
- * This method selects or deselects indivual elements based on the filter level, and
- * additionally sets the filter level.
- *
- * @param i
- */
- public void selectFilterLevel(int level) {
- setFilterLevel(level);
- switch (level) {
- case FILTER_EJB_CLIENT_JARS :
- invertClientJARSelections(ClasspathElement.EJB_CLIENT_JAR);
- break;
- case FILTER_EJB_SERVER_JARS :
- invertClientJARSelections(ClasspathElement.EJB_JAR);
- break;
- default :
- break;
- }
- }
-
- public void invertClientJARSelection(IProject aProject, IProject opposite) {
- ClasspathElement element = getClasspathElement(aProject);
- ClasspathElement oppositeElement = (opposite == null ? null : getClasspathElement(opposite));
- if (element.isSelected())
- invertSelectionIfPossible(element, oppositeElement);
- }
-
- private void invertClientJARSelections(int elementType) {
- if (classpathElements == null)
- return;
-
- for (int i = 0; i < classpathElements.size(); i++) {
- ClasspathElement element = (ClasspathElement) classpathElements.get(i);
- if (element.getJarType() == elementType && element.isSelected()) {
- invertSelectionIfPossible(element, null);
- }
- }
- }
-
- /**
- * @param element
- * @param elementType
- */
- private void invertSelectionIfPossible(ClasspathElement element, ClasspathElement opposite) {
- if (element == null)
- return;
- if (opposite == null)
- opposite = getOppositeElement(element);
- if (opposite != null) {
- opposite.setSelected(true);
- element.setSelected(false);
- }
- }
-
- /**
- * If the element represents an EJB client JAR, returns the corresponding server JAR. If the
- * element represents an EJB server JAR, returns the corresponding client JAR.
- */
- public ClasspathElement getOppositeElement(ClasspathElement element) {
- String uri = element.getText();
- Archive target = element.getTargetArchive();
- if (uri == null || target == null)
- return null;
- Archive oppositeJAR = null;
- switch (element.getJarType()) {
- case (ClasspathElement.EJB_CLIENT_JAR) :
- oppositeJAR = (Archive) clientToEJBJARs.get(target);
- break;
- case (ClasspathElement.EJB_JAR) :
- oppositeJAR = (Archive) ejbToClientJARs.get(target);
- break;
- default :
- break;
- }
- if (oppositeJAR != null)
- return getClasspathElement(oppositeJAR.getURI());
-
- return null;
- }
-
- private void setModifiedIfAnySelected(List elements) {
- for (int i = 0; i < elements.size(); i++) {
- ClasspathElement element = (ClasspathElement) elements.get(i);
- if (element.isSelected())
- setModified(true);
- }
- }
-
- public boolean isMyClientJAR(ClasspathElement element) {
- if (element == null || ejbToClientJARs == null)
- return false;
- Archive myClientJar = (Archive) ejbToClientJARs.get(archive);
- return myClientJar != null && myClientJar == element.getTargetArchive();
- }
-
- public Map getUrisToElements() {
- if(urisToElements == null)
- urisToElements = new HashMap();
- return urisToElements;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java
deleted file mode 100644
index 46b6e46..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.application.internal.operations;
-
-
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEImportConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-
-
-public class ClasspathElement {
- public final static int UTIL_JAR = 0;
- public final static int EJB_JAR = 1;
- public final static int EJB_CLIENT_JAR = 2;
- protected int jarType = UTIL_JAR;
- /** The owner archive of this entry */
- protected Archive archive;
-
- /** The archive this entry references, if it exists */
- protected Archive targetArchive;
-
- /** The display text for this item */
- protected String text;
- /** Indicates if this is selected in the view */
- protected boolean selected;
- protected boolean valid;
- /**
- * The text that is an actual Class-Path entry in the Manifest; in the case of multi-segment
- * uris, might look like ../xxx
- */
- protected String relativeText;
- /** The project that corresponds to the dependent module, when it exists */
- protected IProject project;
- /**
- * If the project is not null, there may be imported jars in the project List of IPath
- */
- protected List importedJarPaths;
- protected IProject earProject;
- protected ClassPathSelection parentSelection;
- protected URI archiveURI;
- protected String earContentFolder;
-
- public ClasspathElement(Archive anArchive) {
- super();
- archive = anArchive;
- }
-
- public ClasspathElement(IProject project) {
- super();
- this.project = project;
- }
-
- public ClasspathElement(URI aArchiveURI) {
- super();
- archiveURI = aArchiveURI;
- }
-
- protected void computeRelativeText() {
- if (archive != null) {
- relativeText = J2EEProjectUtilities.computeRelativeText(archive.getURI(), getText());
- if (relativeText == null)
- relativeText = getText();
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (8/28/2001 5:07:26 PM)
- *
- * @return org.eclipse.core.resources.IProject
- */
- public org.eclipse.core.resources.IProject getEarProject() {
- return earProject;
- }
-
- protected IFile getImportedJarAsIFile() {
- if (getProject() != null) {
- if (getText() != null && getText().endsWith(J2EEImportConstants.IMPORTED_JAR_SUFFIX)) {
- IFile file = getProject().getFile(getText());
- if (file != null && file.exists())
- return file;
- }
- }
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/28/2001 4:33:35 PM)
- *
- * @return java.util.List
- */
- public java.util.List getImportedJarPaths() {
- return importedJarPaths;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/27/2001 1:14:04 PM)
- *
- * @return int
- */
- public int getJarType() {
- return jarType;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/25/2001 6:21:01 PM)
- *
- * @return org.eclipse.core.resources.IProject
- */
- public org.eclipse.core.resources.IProject getProject() {
- return project;
- }
-
- public String getProjectName() {
- return project == null ? null : project.getName();
- }
-
- public java.lang.String getRelativeText() {
- if (relativeText == null)
- computeRelativeText();
- return relativeText;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 11:00:36 AM)
- *
- * @return java.lang.String
- */
- public java.lang.String getText() {
- return text;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 11:01:46 AM)
- *
- * @return boolean
- */
- public boolean isSelected() {
- return selected;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/27/2001 1:04:35 PM)
- *
- * @return boolean
- */
- public boolean isValid() {
- return valid;
- }
-
- public IResource getResource() {
- if (project != null)
- return project;
- return earProject.getFile(getText());
- }
-
- public IClasspathEntry[] newClasspathEntriesForArchive() {
- if( !archiveURI.equals("")){
- String resourcePath = "";
- try {
- resourcePath = ModuleURIUtil.getArchiveName(archiveURI);
- } catch (UnresolveableURIException e) {
- Logger.getLogger().logError(e);
- }
- IPath resPath = new Path(resourcePath);
- if (!resPath.isAbsolute())
- resPath = resPath.makeAbsolute();
- java.io.File file = new java.io.File(resourcePath);
- if( file.exists() || J2EEPlugin.getWorkspace().getRoot().exists(new Path(resourcePath))){
- return new IClasspathEntry[]{JavaCore.newLibraryEntry( resPath, null, null, true)};
- }else{
- return new IClasspathEntry[]{JavaCore.newVariableEntry( resPath, null, null)};
- }
- }
- return new IClasspathEntry[0];
- }
-
-
- /**
- * Adapter method to convert this manifest class path element to zero or more classpath entries
- * for a java build path
- */
- public IClasspathEntry[] newClasspathEntries(Set visited) {
- if (visited.contains(this))
- return new IClasspathEntry[0];
- visited.add(this);
- if (representsImportedJar())
- return new IClasspathEntry[]{JavaCore.newLibraryEntry(getImportedJarAsIFile().getFullPath(), null, null)};
-
- if( archiveURI != null && !archiveURI.equals("") ){
- return newClasspathEntriesForArchive();
- }
- if (!valid && isSelected())
- return new IClasspathEntry[0];
-
- if (project == null)
- return newClasspathEntriesFromEARProject(visited);
-
- IClasspathEntry projectEntry = JavaCore.newProjectEntry(getProject().getFullPath(), true);
- if (importedJarPaths == null || importedJarPaths.isEmpty())
- return new IClasspathEntry[]{projectEntry};
-
- List result = new ArrayList(2);
- result.add(projectEntry);
- for (int i = 0; i < importedJarPaths.size(); i++) {
- IPath path = (IPath) importedJarPaths.get(i);
- result.add(JavaCore.newLibraryEntry(path, null, null));
- }
- return (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
- }
-
- public IClasspathEntry[] newClasspathEntries() {
- return newClasspathEntries(new HashSet());
- }
-
- protected IClasspathEntry newClasspathEntryFromEARProj() {
- IPath path = earProject.getFullPath().append( getEarContentFolder() + IPath.SEPARATOR + earProject.getFile(getText()).getProjectRelativePath());
- return JavaCore.newLibraryEntry(path, path, null, true);
- }
-
- /**
- * The archive is in the EAR and not in a project.
- */
- protected IClasspathEntry[] newClasspathEntriesFromEARProject(Set visited) {
- List cpEntries = new ArrayList();
- cpEntries.add(newClasspathEntryFromEARProj());
- traverseClasspaths(cpEntries, visited);
- return (IClasspathEntry[]) cpEntries.toArray(new IClasspathEntry[cpEntries.size()]);
- }
-
- /*
- * If you have a dependency to a JAR in the EAR project, and the JAR depends on another JAR in
- * the EAR; you want to compile cleanly after import, so you need both those JARs on your build
- * path
- */
- protected void traverseClasspaths(List projectCpEntries, Set visited) {
-
- File aFile = null;
- try {
- aFile = getEARFile().getFile(getText());
- } catch (FileNotFoundException notThere) {
- }
- if (aFile == null || !aFile.isArchive())
- return;
-
- Archive depArchive = (Archive) aFile;
- String[] manifestCpEntries = depArchive.getManifest().getClassPathTokenized();
- for (int i = 0; i < manifestCpEntries.length; i++) {
- String uri = ArchiveUtil.deriveEARRelativeURI(manifestCpEntries[i], depArchive);
- if (uri == null)
- continue;
- ClasspathElement other = parentSelection.getClasspathElement(uri);
- //If the other element is already selected, then
- // we don't need to add it again
- if (other == null || other.isSelected())
- continue;
- IClasspathEntry[] cpEntries = other.newClasspathEntries(visited);
- for (int j = 0; j < cpEntries.length; j++) {
- if (!projectCpEntries.contains(cpEntries[j]))
- projectCpEntries.add(cpEntries[j]);
- }
- }
- }
-
-
- public boolean representsImportedJar() {
- return getImportedJarAsIFile() != null;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/28/2001 5:07:26 PM)
- *
- * @param newEarProject
- * org.eclipse.core.resources.IProject
- */
- public void setEarProject(org.eclipse.core.resources.IProject newEarProject) {
- earProject = newEarProject;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/28/2001 4:33:35 PM)
- *
- * @param newImportedJarPaths
- * java.util.List
- */
- public void setImportedJarPaths(java.util.List newImportedJarPaths) {
- importedJarPaths = newImportedJarPaths;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/27/2001 1:14:04 PM)
- *
- * @param newJarType
- * int
- */
- public void setJarType(int newJarType) {
- jarType = newJarType;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/25/2001 6:21:01 PM)
- *
- * @param newProject
- * org.eclipse.core.resources.IProject
- */
- public void setProject(org.eclipse.core.resources.IProject newProject) {
- project = newProject;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 4:20:55 PM)
- *
- * @param newRelativeText
- * java.lang.String
- */
- public void setRelativeText(java.lang.String newRelativeText) {
- relativeText = newRelativeText;
- }
-
- public void setSelected(Archive referencingJar, Archive referencedJar, List classPath) {
- for (int i = 0; i < classPath.size(); i++) {
- String cpEntry = (String) classPath.get(i);
- String uri = ArchiveUtil.deriveEARRelativeURI(cpEntry, referencingJar);
- if (uri != null && uri.equals(referencedJar.getURI())) {
- setSelected(true);
- return;
- }
- }
- setSelected(false);
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 11:01:46 AM)
- *
- * @param newSelected
- * boolean
- */
- public void setSelected(boolean newSelected) {
- boolean oldSelected = selected;
- selected = newSelected;
- if (oldSelected != newSelected && parentSelection != null)
- parentSelection.setModified(true);
- }
-
- /**
- * Insert the method's description here. Creation date: (8/22/2001 11:00:36 AM)
- *
- * @param newText
- * java.lang.String
- */
- public void setText(java.lang.String newText) {
- text = newText;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/27/2001 1:04:35 PM)
- *
- * @param newValid
- * boolean
- */
- public void setValid(boolean newValid) {
- valid = newValid;
- }
-
- public void setValuesSelected(String cpEntry) {
- setSelected(true);
- setRelativeText(cpEntry);
- }
-
- public String toString() {
- return "ClasspatheElement(" + getText() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- protected EARFile getEARFile() {
- return (EARFile) archive.getContainer();
- }
-
- void setParentSelection(ClassPathSelection selection) {
- parentSelection = selection;
- }
-
- /**
- * Returns the archive.
- *
- * @return Archive
- */
- public Archive getArchive() {
- return archive;
- }
-
- public boolean isEJBJar() {
- return jarType == EJB_JAR;
- }
-
- public boolean isEJBClientJar() {
- return jarType == EJB_CLIENT_JAR;
- }
-
- /**
- * @return
- */
- public Archive getTargetArchive() {
- return targetArchive;
- }
-
- /**
- * @param archive
- */
- public void setTargetArchive(Archive archive) {
- targetArchive = archive;
- }
-
- public URI getArchiveURI() {
- return archiveURI;
- }
-
- public String getEarContentFolder() {
- return earContentFolder;
- }
-
- public void setEarContentFolder(String earContentFolder) {
- this.earContentFolder = earContentFolder;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateDataModelProvider.java
deleted file mode 100644
index f3313f8..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateDataModelProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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:
- * rfrost@bea.com - initial API and impl
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-/**
- * <code>AbstractDataModelProvider</code> subclass that supports the <code>ComputeEARsForContextRootUpdateOp</code>.
- */
-public class ComputeEARsForContextRootUpdateDataModelProvider extends AbstractDataModelProvider implements IUpdateModuleContextRootProperties {
-
- public Set getPropertyNames() {
- final Set propertyNames = super.getPropertyNames();
- propertyNames.add(EARS_TO_UPDATE);
- return propertyNames;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateOp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateOp.java
deleted file mode 100644
index 7b12dc9..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateOp.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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:
- * rfrost@bea.com - initial API and impl
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-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.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <code>AbstractDataModelOperation</code> subclass that computes the set of referencing EARs
- * in which the context-root for a given module will be updated in the application.xml file.
- */
-public class ComputeEARsForContextRootUpdateOp extends AbstractDataModelOperation implements IUpdateModuleContextRootProperties {
-
- public ComputeEARsForContextRootUpdateOp() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- if (monitor != null) {
- monitor.beginTask("", 1);
- }
-
- final IProject project = (IProject)model.getProperty(PROJECT);
- final List earsToUpdate = new ArrayList();
- try {
- // get the set of all referencing EARs
- final IProject[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
-
- // for each EAR, check if the current context-root value is equal to the old context-root setting
- // if it is, update it to reflect the new value
- for (int i = 0; i < ears.length; i++) {
- // check if the current value of the context-root for the module
- // is equal to the value stored in the associated EAR's
- // application.xml
- if (currentRootEqualsEARRoot(ears[i], project)) {
- earsToUpdate.add(ears[i]);
- }
- }
- // Save the list of EARs to update in a nested IDataModel
- IDataModel nestedModel = DataModelFactory.createDataModel(new ComputeEARsForContextRootUpdateDataModelProvider());
- nestedModel.setProperty(EARS_TO_UPDATE, earsToUpdate);
- model.addNestedModel(NESTED_MODEL_ID, nestedModel);
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- return OK_STATUS;
- }
-
- /*
- * Determines if the current module context-root is equal to the value in the application.xml.
- */
- private boolean currentRootEqualsEARRoot(final IProject earProject, final IProject moduleProject) {
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- if (earEdit == null) {
- return false;
- }
- final Application app = earEdit.getApplication();
- final IVirtualComponent comp = ComponentCore.createComponent(moduleProject);
- if (app == null || comp == null) {
- return false;
- }
- final String moduleURI = AddComponentToEnterpriseApplicationDataModelProvider.getComponentURI(comp);
- final Module module = app.getFirstModule(moduleURI);
- if (module != null && module instanceof WebModule) {
- final Properties props = comp.getMetaProperties();
- if ((props != null) && (props.containsKey(J2EEConstants.CONTEXTROOT))) {
- return ((WebModule) module).getContextRoot().equals(props.getProperty(J2EEConstants.CONTEXTROOT));
- }
- }
- } finally {
- if (earEdit != null) {
- earEdit.dispose();
- }
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // no-op
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // no-op
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultJ2EEComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultJ2EEComponentCreationOperation.java
deleted file mode 100644
index 1a40d73..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultJ2EEComponentCreationOperation.java
+++ /dev/null
@@ -1,134 +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.jst.j2ee.application.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.activities.WTPActivityBridge;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class DefaultJ2EEComponentCreationOperation extends AbstractDataModelOperation implements IDefaultJ2EEComponentCreationDataModelProperties {
-
- public static final String JCA_DEV_ACTIVITY_ID = "com.ibm.wtp.jca.development"; //$NON-NLS-1$
-
- public static final String WEB_DEV_ACTIVITY_ID = "com.ibm.wtp.web.development"; //$NON-NLS-1$
-
- public static final String ENTERPRISE_JAVA = "com.ibm.wtp.ejb.development"; //$NON-NLS-1$
-
- public DefaultJ2EEComponentCreationOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- if (model.getBooleanProperty(CREATE_EJB)) {
- IDataModel projectModel = model.getNestedModel(NESTED_MODEL_EJB);
- createEJBComponent(projectModel, monitor);
- }
- if (model.getBooleanProperty(CREATE_WEB)) {
- IDataModel projectModel = model.getNestedModel(NESTED_MODEL_WEB);
- createWebJ2EEComponent(projectModel, monitor);
- }
- if (model.getBooleanProperty(CREATE_CONNECTOR)) {
- IDataModel projectModel = model.getNestedModel(NESTED_MODEL_JCA);
- createRarJ2EEComponent(projectModel, monitor);
- }
- if (model.getBooleanProperty(CREATE_APPCLIENT)) {
- IDataModel projectModel = model.getNestedModel(NESTED_MODEL_CLIENT);
- createAppClientComponent(projectModel, monitor);
- }
- } catch (Exception e) {
- Logger.getLogger().log(e.getMessage());
- }
- return OK_STATUS;
- }
-
- /**
- * @param model
- */
- private void createEJBComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
- model.getDefaultOperation().execute(monitor, null);
- addDefaultFacets(model);
- WTPActivityBridge.getInstance().enableActivity(ENTERPRISE_JAVA, true);
- }
-
- /**
- * @param model
- */
- private void createWebJ2EEComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
- model.getDefaultOperation().execute(monitor, null);
- addDefaultFacets(model);
- WTPActivityBridge.getInstance().enableActivity(WEB_DEV_ACTIVITY_ID, true);
- }
-
- private void addDefaultFacets(IDataModel model) throws CoreException{
- IRuntime runtime = (IRuntime) model.getProperty(FacetProjectCreationDataModelProvider.FACET_RUNTIME);
- String projectName = model.getStringProperty(FacetProjectCreationDataModelProvider.FACET_PROJECT_NAME);
- IProject project = ProjectUtilities.getProject( projectName );
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
-
- }
-
- if( facetedProject != null && runtime != null ){
- try {
- FacetProjectCreationOperation.addDefaultFactets( facetedProject, runtime );
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- /**
- * @param model
- */
- private void createRarJ2EEComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
- model.getDefaultOperation().execute(monitor, null);
- addDefaultFacets(model);
- WTPActivityBridge.getInstance().enableActivity(ENTERPRISE_JAVA, true);
- }
-
- /**
- * @param model
- */
- private void createAppClientComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
- model.getDefaultOperation().execute(monitor, null);
- addDefaultFacets(model);
- WTPActivityBridge.getInstance().enableActivity(ENTERPRISE_JAVA, true);
-
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentExportDataModelProvider.java
deleted file mode 100644
index 52037bf..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,71 +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.jst.j2ee.application.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EARComponentExportDataModelProvider extends J2EEArtifactExportDataModelProvider {
-
- public EARComponentExportDataModelProvider() {
- super();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EARComponentExportOperation(model);
- }
-
- protected String getModuleExtension() {
- return ".ear"; //$NON-NLS-1$
- }
-
- protected String getWrongComponentTypeString(String projectName) {
- return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_AN_EAR, new Object[]{projectName});
- }
-
- protected String getProjectType() {
- return J2EEProjectUtilities.ENTERPRISE_APPLICATION;
- }
- /**
- * Exports the specified Enterprise Appliction project to the specified EAR file.
- *
- * @param earProjectName
- * The name of the Enterprise Application project to export.
- * @param earFileName
- * The fully qualified EAR file location to export the specified Enterprise
- * Application project.
- * @param overwriteExisting
- * If this is <code>true</code> then an existing file at the location specified by
- * <code>earFileName</code> will be overwritten.
- * @param exportSource
- * If this is <code>true</code> then all source files in the specified Enterprise
- * Application Project and all its modules will be included in the resulting EAR
- * file.
- * @plannedfor WTP 1.0
- */
-//TODO: can this be done in the new datamodel framework?
-// public static void exportProject(String earProjectName, String earFileName, boolean overwriteExisting, boolean exportSource) {
-// EnterpriseApplicationExportDataModel dataModel = new EnterpriseApplicationExportDataModel();
-// dataModel.setProperty(PROJECT_NAME, earProjectName);
-// dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-// dataModel.setProperty(ARCHIVE_DESTINATION, earFileName);
-// dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-// try {
-// dataModel.getDefaultOperation().run(null);
-// } catch (InvocationTargetException e) {
-// Logger.getLogger().logError(e);
-// } catch (InterruptedException e) {
-// Logger.getLogger().logError(e);
-// }
-// }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
deleted file mode 100644
index fa19f64..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,673 +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.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.FileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WARFileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaUtilityJarImportDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentImportOperation;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * This dataModel is used for to import Enterprise Applications(from EAR files) into the workspace.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public final class EARComponentImportDataModelProvider extends J2EEArtifactImportDataModelProvider implements IAnnotationsDataModel, IEARComponentImportDataModelProperties {
-
- /**
- * This is only to force validation for the nested projects; do not set.
- */
- public static final String NESTED_PROJECTS_VALIDATION = "EARImportDataModel.NESTED_PROJECTS_VALIDATION"; //$NON-NLS-1$
-
-
- private IDataModelListener nestedListener = new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(COMPONENT_NAME)) {
- model.notifyPropertyChange(NESTED_PROJECTS_VALIDATION, IDataModel.DEFAULT_CHG);
- }
- }
- };
-
- private Hashtable ejbJarToClientJarModels = new Hashtable();
-
- private Hashtable clientJarToEjbJarModels = new Hashtable();
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(NESTED_MODULE_ROOT);
- propertyNames.add(UTILITY_LIST);
- propertyNames.add(MODULE_MODELS_LIST);
- propertyNames.add(EJB_CLIENT_LIST);
- propertyNames.add(UTILITY_MODELS_LIST);
- propertyNames.add(NESTED_PROJECTS_VALIDATION);
- propertyNames.add(SELECTED_MODELS_LIST);
- propertyNames.add(USE_ANNOTATIONS);
- propertyNames.add(ALL_PROJECT_MODELS_LIST);
- propertyNames.add(UNHANDLED_PROJECT_MODELS_LIST);
- propertyNames.add(HANDLED_PROJECT_MODELS_LIST);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (NESTED_MODULE_ROOT.equals(propertyName)) {
- return getLocation().toOSString();
- } else if (MODULE_MODELS_LIST.equals(propertyName) || UTILITY_LIST.equals(propertyName) || UTILITY_MODELS_LIST.equals(propertyName) || SELECTED_MODELS_LIST.equals(propertyName) || EJB_CLIENT_LIST.equals(propertyName)) {
- return Collections.EMPTY_LIST;
- } else if (USE_ANNOTATIONS.equals(propertyName)) {
- return Boolean.FALSE;
- } else if (ALL_PROJECT_MODELS_LIST.equals(propertyName)) {
- return getProjectModels();
- } else if (UNHANDLED_PROJECT_MODELS_LIST.equals(propertyName)) {
- return getUnhandledProjectModels();
- } else if (HANDLED_PROJECT_MODELS_LIST.equals(propertyName)) {
- return getHandledSelectedModels();
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public void propertyChanged(DataModelEvent event) {
- super.propertyChanged(event);
- if (event.getPropertyName().equals(PROJECT_NAME)) {
- changeModuleCreationLocationForNameChange(getProjectModels());
- } else if (event.getPropertyName().equals(RUNTIME_TARGET_ID) && event.getDataModel() == model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION)) {
- Object propertyValue = event.getProperty();
- IDataModel nestedModel = null;
- List projectModels = (List) getProperty(ALL_PROJECT_MODELS_LIST);
- for (int i = 0; i < projectModels.size(); i++) {
- nestedModel = (IDataModel) projectModels.get(i);
- nestedModel.setProperty(RUNTIME_TARGET_ID, propertyValue);
- }
- }
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (ALL_PROJECT_MODELS_LIST.equals(propertyName) || UNHANDLED_PROJECT_MODELS_LIST.equals(propertyName) || HANDLED_PROJECT_MODELS_LIST.equals(propertyName)) {
- throw new RuntimeException(propertyName + " is an unsettable property"); //$NON-NLS-1$
- }
- boolean doSet = super.propertySet(propertyName, propertyValue);
- if (NESTED_MODULE_ROOT.equals(propertyName)) {
- changeModuleCreationLocationForAll(getProjectModels(), (String) propertyValue);
- } else if (FILE_NAME.equals(propertyName)) {
- setProperty(MODULE_MODELS_LIST, getModuleModels());
- setProperty(UTILITY_LIST, null);
-
-
- IDataModel earProjectModel = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- if (getArchiveFile() != null) {
- earProjectModel.setIntProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, ArchiveUtil.getFastSpecVersion((ModuleFile) getArchiveFile()));
- }
-
- model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
- setBooleanProperty(USE_ANNOTATIONS, false);
- model.notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
- } else if (UTILITY_LIST.equals(propertyName)) {
- updateUtilityModels((List) propertyValue);
- } else if (USE_ANNOTATIONS.equals(propertyName)) {
- List projectModels = (List) getProperty(MODULE_MODELS_LIST);
- IDataModel nestedModel = null;
- for (int i = 0; i < projectModels.size(); i++) {
- nestedModel = (IDataModel) projectModels.get(i);
- if (nestedModel.isProperty(USE_ANNOTATIONS)) {
- nestedModel.setProperty(USE_ANNOTATIONS, propertyValue);
- }
- }
- } else if (MODULE_MODELS_LIST.equals(propertyName)) {
- List newList = new ArrayList();
- newList.addAll(getProjectModels());
- setProperty(SELECTED_MODELS_LIST, newList);
- } else if (PROJECT_NAME.equals(propertyName)) {
- List nestedModels = (List) getProperty(MODULE_MODELS_LIST);
- IDataModel nestedModel = null;
- for (int i = 0; i < nestedModels.size(); i++) {
- nestedModel = (IDataModel) nestedModels.get(i);
- nestedModel.setProperty(IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME, propertyValue);
- }
- nestedModels = (List) getProperty(UTILITY_MODELS_LIST);
- for (int i = 0; i < nestedModels.size(); i++) {
- nestedModel = (IDataModel) nestedModels.get(i);
- nestedModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, propertyValue);
- }
- IProject project = ProjectUtilities.getProject(getStringProperty(PROJECT_NAME));
- if (null != project && project.exists()) {
- IRuntime target = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (null != target) {
- setProperty(RUNTIME_TARGET_ID, target.getId());
- }
- }
- } else if (COMPONENT_NAME.equals(propertyName)) {
- List nestedModels = (List) getProperty(MODULE_MODELS_LIST);
- IDataModel nestedModel = null;
- for (int i = 0; i < nestedModels.size(); i++) {
- nestedModel = (IDataModel) nestedModels.get(i);
- nestedModel.setProperty(IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME, propertyValue);
- }
- nestedModels = (List) getProperty(UTILITY_MODELS_LIST);
- for (int i = 0; i < nestedModels.size(); i++) {
- nestedModel = (IDataModel) nestedModels.get(i);
- nestedModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_COMPONENT_NAME, propertyValue);
- }
- }
- return doSet;
- }
-
- public List getAllUtilitiesExceptEJBClients(EARFile earFile) {
- List clientList = (List) getProperty(EJB_CLIENT_LIST);
- List list = getAllUtilities(earFile);
- for (int i = list.size() - 1; i > -1; i--) {
- FileImpl file = (FileImpl) list.get(i);
- boolean shouldRemove = false;
- for (int j = 0; j < clientList.size() && !shouldRemove; j++) {
- IDataModel localModel = (IDataModel) clientList.get(j);
- if (localModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE) == file) {
- shouldRemove = true;
- }
- }
-
- if (shouldRemove) {
- list.remove(i);
- }
- }
- return list;
- }
-
- public static List getAllUtilities(EARFile earFile) {
- List files = earFile.getFiles();
- List utilJars = new ArrayList();
- for (int i = 0; i < files.size(); i++) {
- FileImpl file = (FileImpl) files.get(i);
- if (file.isArchive() && !file.isModuleFile() && file.getURI().endsWith(".jar")) { //$NON-NLS-1$
- utilJars.add(file);
- }
- if (file.isWARFile()) {
- utilJars.addAll(getWebLibs((WARFile) file));
- }
- }
- return utilJars;
- }
-
- public static List getWebLibs(WARFile warFile) {
- return ((WARFileImpl) warFile).getLibArchives();
- }
-
-
- protected boolean forceResetOnPreserveMetaData() {
- return false;
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(NESTED_PROJECTS_VALIDATION)) {
- String earProjectName = getStringProperty(PROJECT_NAME);
- List subProjects = getSelectedModels();
- IDataModel subDataModel = null;
- String tempProjectName = null;
- Archive tempArchive = null;
- IStatus tempStatus = null;
- Hashtable projects = new Hashtable(4);
- for (int i = 0; i < subProjects.size(); i++) {
- subDataModel = (IDataModel) subProjects.get(i);
- tempProjectName = subDataModel.getStringProperty(PROJECT_NAME);
- // TODO: add manual validation
- // IStatus status = ProjectCreationDataModel.validateProjectName(tempProjectName);
- // if (!status.isOK()) {
- // return status;
- // }
- tempArchive = (Archive) subDataModel.getProperty(FILE);
- // if (!overwrite && subDataModel.getProject().exists()) {
- // return
- // WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.getString("EARImportDataModel_UI_0",
- // new Object[]{tempProjectName, tempArchive.getURI()})); //$NON-NLS-1$
- // }
- tempStatus = subDataModel.validate();
- if (!tempStatus.isOK()) {
- return tempStatus;
- }
- if (tempProjectName.equals(earProjectName)) {
- return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.getString("EARImportDataModel_UI_1", new Object[]{tempProjectName, tempArchive.getURI()})); //$NON-NLS-1$
- } else if (!WTPPlugin.isPlatformCaseSensitive()) {
- if (tempProjectName.toLowerCase().equals(earProjectName.toLowerCase())) {
- return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.getString("EARImportDataModel_UI_1", new Object[]{tempProjectName, tempArchive.getURI()})); //$NON-NLS-1$
- }
- }
- if (projects.containsKey(tempProjectName)) {
- return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.getString("EARImportDataModel_UI_2", new Object[]{tempProjectName, tempArchive.getURI(), ((Archive) projects.get(tempProjectName)).getURI()})); //$NON-NLS-1$
- } else if (!WTPPlugin.isPlatformCaseSensitive()) {
- String lowerCaseProjectName = tempProjectName.toLowerCase();
- String currentKey = null;
- Enumeration keys = projects.keys();
- while (keys.hasMoreElements()) {
- currentKey = (String) keys.nextElement();
- if (currentKey.toLowerCase().equals(lowerCaseProjectName)) {
- return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.getString("EARImportDataModel_UI_2", new Object[]{tempProjectName, tempArchive.getURI(), ((Archive) projects.get(currentKey)).getURI()})); //$NON-NLS-1$
- }
- }
- }
- projects.put(tempProjectName, tempArchive);
- }
- }
- // TODO: check context root is not inside current working
- // directory...this is invalid
- return super.validate(propertyName);
- }
-
- private void changeModuleCreationLocationForAll(List projects, String property) {
- IDataModel localModel = null;
- for (int i = 0; null != projects && i < projects.size(); i++) {
- localModel = (IDataModel) projects.get(i);
- IPath newPath = new Path(property);
- newPath = newPath.append((String) localModel.getProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME));
- // model.setProperty(J2EEComponentCreationDataModel.PROJECT_LOCATION,
- // newPath.toOSString());
- }
- }
-
- private void changeModuleCreationLocationForNameChange(List projects) {
- IDataModel localModel = null;
- for (int i = 0; null != projects && i < projects.size(); i++) {
- localModel = (IDataModel) projects.get(i);
- if (isPropertySet(NESTED_MODULE_ROOT)) {
- IPath newPath = new Path((String) getProperty(NESTED_MODULE_ROOT));
- newPath = newPath.append((String) localModel.getProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME));
- // model.setProperty(J2EEComponentCreationDataModel.PROJECT_LOCATION,
- // newPath.toOSString());
- } else {
- // model.setProperty(J2EEComponentCreationDataModel.PROJECT_LOCATION, null);
- }
- }
- }
-
- private IPath getLocation() {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation();
- }
-
- private void trimSelection() {
- boolean modified = false;
- List selectedList = getSelectedModels();
- List allList = getProjectModels();
- for (int i = selectedList.size() - 1; i > -1; i--) {
- if (!allList.contains(selectedList.get(i))) {
- modified = true;
- selectedList.remove(i);
- }
- }
- if (modified) {
- List newList = new ArrayList();
- newList.addAll(selectedList);
- setProperty(SELECTED_MODELS_LIST, newList);
- }
- }
-
- private void updateUtilityModels(List utilityJars) {
- updateUtilityModels(utilityJars, SELECTED_MODELS_LIST, UTILITY_MODELS_LIST);
- }
-
- private void updateUtilityModels(List utilityJars, String selectedProperty, String listTypeProperty) {
- boolean allSelected = true;
- List selectedList = (List) getProperty(selectedProperty);
- List allList = getProjectModels();
- if (selectedList.size() == allList.size()) {
- for (int i = 0; i < selectedList.size() && allSelected; i++) {
- if (!selectedList.contains(allList.get(i)) || !allList.contains(selectedList.get(i))) {
- allSelected = false;
- }
- }
- } else {
- allSelected = false;
- }
- List utilityModels = (List) getProperty(listTypeProperty);
- Archive currentArchive = null;
- IDataModel currentUtilityModel = null;
- boolean utilityJarsModified = false;
- // Add missing
- for (int i = 0; null != utilityJars && i < utilityJars.size(); i++) {
- currentArchive = (Archive) utilityJars.get(i);
- boolean added = false;
- for (int j = 0; utilityModels != null && j < utilityModels.size() && !added; j++) {
- currentUtilityModel = (IDataModel) utilityModels.get(j);
- if (currentUtilityModel.getProperty(IJavaUtilityJarImportDataModelProperties.FILE) == currentArchive) {
- added = true;
- }
- }
- if (!added) {
- if (!isPropertySet(listTypeProperty)) {
- utilityModels = new ArrayList();
- setProperty(listTypeProperty, utilityModels);
- }
- IDataModel localModel = DataModelFactory.createDataModel(new J2EEUtilityJarImportDataModelProvider());
- localModel.setProperty(IJavaUtilityJarImportDataModelProperties.FILE, currentArchive);
- localModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, getStringProperty(PROJECT_NAME));
- localModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_COMPONENT_NAME, getStringProperty(COMPONENT_NAME));
- localModel.setProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID, getStringProperty(RUNTIME_TARGET_ID));
- utilityModels.add(localModel);
- localModel.addListener(nestedListener);
- utilityJarsModified = true;
- }
- } // Remove extras
- for (int i = utilityModels.size() - 1; i >= 0; i--) {
- currentUtilityModel = (IDataModel) utilityModels.get(i);
- currentArchive = (Archive) currentUtilityModel.getProperty(IJavaUtilityJarImportDataModelProperties.FILE);
- if (null == utilityJars || !utilityJars.contains(currentArchive)) {
- currentUtilityModel.removeListener(nestedListener);
- currentUtilityModel.dispose();
- utilityModels.remove(currentUtilityModel);
- utilityJarsModified = true;
- }
- }
- allList = getProjectModels();
- if (allSelected) {
- List newList = new ArrayList();
- newList.addAll(allList);
- setProperty(SELECTED_MODELS_LIST, newList);
- } else {
- trimSelection();
- }
- if (utilityJarsModified) {
- model.notifyPropertyChange(NESTED_PROJECTS_VALIDATION, IDataModel.VALUE_CHG);
- }
- }
-
- private List getModuleModels() {
- if (getArchiveFile() == null)
- return Collections.EMPTY_LIST;
- List moduleFiles = getEARFile().getModuleFiles();
- List moduleModels = new ArrayList();
- List clientJarArchives = new ArrayList();
- IDataModel localModel;
- String earProjectName = getStringProperty(PROJECT_NAME);
- String earComponentName = getStringProperty(COMPONENT_NAME);
- List defaultModuleNames = new ArrayList();
- defaultModuleNames.add(earProjectName);
- List collidingModuleNames = null;
- Hashtable ejbJarsWithClients = new Hashtable();
- for (int i = 0; i < moduleFiles.size(); i++) {
- localModel = null;
- ModuleFile temp = (ModuleFile) moduleFiles.get(i);
- if (temp.isApplicationClientFile()) {
- localModel = DataModelFactory.createDataModel(new AppClientComponentImportDataModelProvider());
- } else if (temp.isWARFile()) {
- WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
- if (webExt != null) {
- localModel = webExt.createImportDataModel();
- WebModule webModule = (WebModule) getEARFile().getModule(temp.getURI(), null);
- if (null != webModule && null != webModule.getContextRoot()) {
- localModel.setProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, webModule.getContextRoot());
- }
- }
- } else if (temp.isEJBJarFile()) {
- EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
- if (ejbExt != null) {
- localModel = ejbExt.createImportDataModel();
- }
- EJBJar jar = ((EJBJarFile) temp).getDeploymentDescriptor();
- if (jar != null) {
- if (jar.getEjbClientJar() != null) {
- String clientName = jar.getEjbClientJar();
- try {
- Archive clientArchive = (Archive) getEARFile().getFile(clientName);
- clientJarArchives.add(clientArchive);
- ejbJarsWithClients.put(localModel, clientArchive);
- } catch (Exception e) {
- // TODO: handle exception
- }
- }
- }
- } else if (temp.isRARFile()) {
- JcaModuleExtension rarExt = EarModuleManager.getJCAModuleExtension();
- if (rarExt != null) {
- localModel = rarExt.createImportDataModel();
- }
- }
- if (localModel != null) {
- localModel.setProperty(FILE, temp);
- localModel.setProperty(IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME, earComponentName);
- localModel.setBooleanProperty(IJ2EEModuleImportDataModelProperties.ADD_TO_EAR, false);
- localModel.setProperty(RUNTIME_TARGET_ID, getProperty(RUNTIME_TARGET_ID));
- localModel.addListener(this);
- localModel.addListener(nestedListener);
- moduleModels.add(localModel);
- String moduleName = localModel.getStringProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME);
- if (defaultModuleNames.contains(moduleName)) {
- if (collidingModuleNames == null) {
- collidingModuleNames = new ArrayList();
- }
- collidingModuleNames.add(moduleName);
- } else {
- defaultModuleNames.add(moduleName);
- }
- }
- }
- updateUtilityModels(clientJarArchives, EJB_CLIENT_LIST, EJB_CLIENT_LIST);
- List clientModelList = (List) getProperty(EJB_CLIENT_LIST);
- Enumeration ejbModels = ejbJarsWithClients.keys();
- ejbJarToClientJarModels.clear();
- clientJarToEjbJarModels.clear();
- while (ejbModels.hasMoreElements()) {
- Object ejbModel = ejbModels.nextElement();
- Object archive = ejbJarsWithClients.get(ejbModel);
- Object clientModel = null;
- for (int i = 0; clientModel == null && i < clientModelList.size(); i++) {
- if (((IDataModel) clientModelList.get(i)).getProperty(FILE) == archive) {
- clientModel = clientModelList.get(i);
- }
- }
- ejbJarToClientJarModels.put(ejbModel, clientModel);
- clientJarToEjbJarModels.put(clientModel, ejbModel);
- }
-
- for (int i = 0; collidingModuleNames != null && i < moduleModels.size(); i++) {
- localModel = (IDataModel) moduleModels.get(i);
- String moduleName = localModel.getStringProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME);
- if (collidingModuleNames.contains(moduleName)) {
- ModuleFile module = (ModuleFile) localModel.getProperty(IJ2EEModuleImportDataModelProperties.FILE);
- String suffix = null;
- if (module.isApplicationClientFile()) {
- suffix = "_AppClient"; //$NON-NLS-1$
- } else if (module.isWARFile()) {
- suffix = "_WEB"; //$NON-NLS-1$
- } else if (module.isEJBJarFile()) {
- suffix = "_EJB"; //$NON-NLS-1$
- } else if (module.isRARFile()) {
- suffix = "_JCA"; //$NON-NLS-1$
- }
- if (defaultModuleNames.contains(moduleName + suffix)) {
- int count = 1;
- for (; defaultModuleNames.contains(moduleName + suffix + count) && count < 10; count++);
- suffix += count;
- }
- localModel.setProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME, moduleName + suffix);
- }
- }
- return moduleModels;
- }
-
- protected int getType() {
- return XMLResource.APPLICATION_TYPE;
- }
-
- protected Archive openArchive(String uri) throws OpenFailureException {
- return CommonarchiveFactory.eINSTANCE.openEARFile(getArchiveOptions(), uri);
- }
-
- private EARFile getEARFile() {
- return (EARFile) getArchiveFile();
- }
-
- public boolean handlesArchive(Archive anArchive) {
- List temp = new ArrayList();
- List tempList = (List) getProperty(MODULE_MODELS_LIST);
- if (null != tempList) {
- temp.addAll(tempList);
- }
- tempList = (List) getProperty(EJB_CLIENT_LIST);
- if (null != tempList) {
- temp.addAll(tempList);
- }
- tempList = getSelectedModels();
- for (int i = 0; i < tempList.size(); i++) {
- if (!temp.contains(tempList.get(i))) {
- temp.add(tempList.get(i));
- }
- }
- IDataModel importDM = null;
- for (int i = 0; i < temp.size(); i++) {
- importDM = (IDataModel) temp.get(i);
- if (importDM.getProperty(FILE) == anArchive) {
- return true;
- }
- }
- return false;
- }
-
- private List getProjectModels() {
- List temp = new ArrayList();
- List tempList = (List) getProperty(MODULE_MODELS_LIST);
- if (null != tempList) {
- temp.addAll(tempList);
- }
- tempList = (List) getProperty(UTILITY_MODELS_LIST);
- if (null != tempList) {
- temp.addAll(tempList);
- }
- tempList = (List) getProperty(EJB_CLIENT_LIST);
- if (null != tempList) {
- temp.addAll(tempList);
- }
- return temp;
- }
-
- private List getUnhandledProjectModels() {
- List handled = removeHandledModels(getProjectModels(), getProjectModels(), false);
- List all = getProjectModels();
- all.removeAll(handled);
- return all;
- }
-
- public List getSelectedModels() {
- return (List) getProperty(SELECTED_MODELS_LIST);
- }
-
- private List removeHandledModels(List listToPrune, List modelsToCheck, boolean addModels) {
- List newList = new ArrayList();
- newList.addAll(listToPrune);
- IDataModel localModel = null;
- for (int i = 0; i < modelsToCheck.size(); i++) {
- localModel = (IDataModel) modelsToCheck.get(i);
- // model.extractHandled(newList, addModels);
- }
- return newList;
- }
-
- private List getHandledSelectedModels() {
- List selectedModels = getSelectedModels();
- return removeHandledModels(selectedModels, selectedModels, true);
- }
-
- public int getJ2EEVersion() {
- EARFile ef = getEARFile();
- return null == ef ? J2EEVersionConstants.J2EE_1_2_ID : ArchiveUtil.getFastSpecVersion(ef);
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (!super.isPropertyEnabled(propertyName)) {
- return false;
- }
- if (propertyName.equals(USE_ANNOTATIONS)) {
- if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
- return false;
- return true;
- }
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEImportDataModel#dispose()
- */
- public void dispose() {
- super.dispose();
- List list = getProjectModels();
- for (int i = 0; i < list.size(); i++) {
- ((IDataModel) list.get(i)).dispose();
- }
- EARFile earFile = getEARFile();
- if (earFile != null)
- earFile.close();
- }
-
- // TODO: Implement with J2EEArtifactImportDataModelProvider
- /*
- * public J2EEArtifactImportDataModel getMatchingEJBJarOrClient(J2EEArtifactImportDataModel
- * model) { if (clientJarToEjbJarModels.containsKey(model)) { return
- * (J2EEArtifactImportDataModel) clientJarToEjbJarModels.get(model); } else if
- * (ejbJarToClientJarModels.containsKey(model)) { return (J2EEArtifactImportDataModel)
- * ejbJarToClientJarModels.get(model); } else { return null; } }
- */
-
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EARComponentImportOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportFactory.java
deleted file mode 100644
index 282d15a..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportFactory.java
+++ /dev/null
@@ -1,36 +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
- *******************************************************************************/
-/*
- * Created on Jun 21, 2004
- * @author jsholl
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author jsholl
- */
-public interface ExtendedImportFactory {
-
- public Archive openArchive(ArchiveOptions archiveOptions, String uri) throws OpenFailureException;
-
- public void importModuleFile(IDataModel model, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
-
- public int getSpecVersion(Archive archive);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportRegistry.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportRegistry.java
deleted file mode 100644
index fdfc974..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportRegistry.java
+++ /dev/null
@@ -1,95 +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
- *******************************************************************************/
-/*
- * Created on Jun 21, 2004
- * @author jsholl
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * @author jsholl
- */
-public class ExtendedImportRegistry extends RegistryReader {
-
- private static final String PLUGIN_ID = J2EEPlugin.PLUGIN_ID;
-
- private static final String EXTENSION_ID = "ExtendedModuleImport"; //$NON-NLS-1$
-
- private static final String FACTORY_CLASS = "factoryClass"; //$NON-NLS-1$
-
- private static final String MODULE_TYPE = "moduleType"; //$NON-NLS-1$
-
- public static final String EJB_TYPE = "EJB"; //$NON-NLS-1$
-
- private List ejbConfigurationElements = null;
-
- private List ejbFactories = null;
-
- private static ExtendedImportRegistry instance = null;
-
- public static ExtendedImportRegistry getInstance() {
- //if (null == instance) {
- instance = new ExtendedImportRegistry();
- //}
- return instance;
- }
-
- private ExtendedImportRegistry() {
- super(PLUGIN_ID, EXTENSION_ID);
- readRegistry();
- }
-
- /**
- * returns a List of ExtendedFactories;
- *
- * @param type
- * @return
- */
- public List getFactories(String type) {
- if (type.equals(EJB_TYPE)) {
- if (ejbFactories == null) {
- ejbFactories = new ArrayList();
- for (int i = 0; null != ejbConfigurationElements && i < ejbConfigurationElements.size(); i++) {
- try {
- ejbFactories.add(((IConfigurationElement) ejbConfigurationElements.get(i)).createExecutableExtension(FACTORY_CLASS));
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- return ejbFactories;
- }
- return null;
- }
-
- public boolean readElement(IConfigurationElement element) {
- String moduleType = element.getAttribute(MODULE_TYPE);
- if (null != moduleType) {
- if (moduleType.equals(EJB_TYPE)) {
- if (ejbConfigurationElements == null) {
- ejbConfigurationElements = new ArrayList();
- }
- ejbConfigurationElements.add(element);
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModelProvider.java
deleted file mode 100644
index 25a2290..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,93 +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.jst.j2ee.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataModelProvider;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.FlexibleProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class FlexibleJavaProjectCreationDataModelProvider extends FlexibleProjectCreationDataModelProvider implements IFlexibleJavaProjectCreationDataModelProperties {
-
- public FlexibleJavaProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- IDataModel serverTargetModel = DataModelFactory.createDataModel(new J2EEProjectServerTargetDataModelProvider());
- model.addNestedModel(NESTED_MODEL_SERVER_TARGET, serverTargetModel);
- }
-
- protected void initNestedProjectModel() {
- IDataModel javaProjModel = DataModelFactory.createDataModel(new JavaProjectCreationDataModelProvider());
- model.addNestedModel(NESTED_MODEL_PROJECT_CREATION, javaProjModel);
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(NESTED_MODEL_SERVER_TARGET);
- propertyNames.add(ADD_SERVER_TARGET);
- propertyNames.add(RUNTIME_TARGET_ID);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(ADD_SERVER_TARGET)) {
- return Boolean.TRUE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean status = super.propertySet(propertyName, propertyValue);
- if (PROJECT_NAME.equals(propertyName)) {
- IDataModel projModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
- projModel.setProperty(IJ2EEProjectServerTargetDataModelProperties.PROJECT_NAME, propertyValue);
- } else if (RUNTIME_TARGET_ID.equals(propertyName)) {
- IDataModel projModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
- projModel.setProperty(IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID, propertyValue);
- }
- return status;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new FlexibleJavaProjectCreationOperation(model);
- }
-
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (propertyName.equals(RUNTIME_TARGET_ID)) {
- IDataModel serverTargetModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
- return serverTargetModel.getValidPropertyDescriptors(IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID);
- }
- return null;
- }
-
- public IStatus validate(String propertyName) {
- IStatus status = super.validate(propertyName);
- if (!status.isOK()) {
- return status;
- } else if (propertyName.equals(NESTED_MODEL_SERVER_TARGET)) {
-// IDataModel stModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
-// return stModel.validate();
- }
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationOperation.java
deleted file mode 100644
index e3b220d..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationOperation.java
+++ /dev/null
@@ -1,58 +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.jst.j2ee.application.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.FlexibleProjectCreationOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class FlexibleJavaProjectCreationOperation extends FlexibleProjectCreationOperation implements IFlexibleJavaProjectCreationDataModelProperties{
-
- public FlexibleJavaProjectCreationOperation(IDataModel model) {
- super(model);
- }
- private void addServerTarget(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException{
- IDataModel serverModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
- IDataModelOperation op = serverModel.getDefaultOperation();
- op.execute(monitor, null);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = super.execute(monitor, info);
- try {
- createJavaEMFNature();
- addServerTarget(monitor);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- } catch (InvocationTargetException e) {
- Logger.getLogger().log(e);
- } catch (InterruptedException e) {
- Logger.getLogger().log(e);
- }
- return status;
- }
- protected void createJavaEMFNature() throws CoreException {
- JavaEMFNature nature = JavaEMFNature.createRuntime(getProject());
- nature.getResourceSet();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAddComponentToEnterpriseApplicationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAddComponentToEnterpriseApplicationDataModelProperties.java
deleted file mode 100644
index 5077464..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAddComponentToEnterpriseApplicationDataModelProperties.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.jst.j2ee.application.internal.operations;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-
-public interface IAddComponentToEnterpriseApplicationDataModelProperties extends ICreateReferenceComponentsDataModelProperties {
-
- /**
- * Returns a Map which maps Components in the TARGET_COMPONENT_LIST list to the name Strings
- * that should be used when adding them to the ear.
- */
- public static final String TARGET_COMPONENTS_TO_URI_MAP = "IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP";
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java
deleted file mode 100644
index 8b8a477..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java
+++ /dev/null
@@ -1,35 +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.jst.j2ee.application.internal.operations;
-
-/**
- * The IAnnotationsDataModel is data model interface used by other data models in
- * the WTP wizard and operation framework.
- * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel
- * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation
- *
- * This provides the USE_ANNOTATIONS property which is used to determine whether or
- * not artifacts should be created using annotations or not.
- *
- * Subclasses may extend this interface to add their own properties.
- *
- * The use of this interface is EXPERIMENTAL and subject to substantial changes.
- *
- */
-public interface IAnnotationsDataModel {
-
- /**
- * Optional, type Boolean to determine whether an artifact should be created with annotated tags.
- * The default is set on the particular data model who implements this interface.
- */
- public static final String USE_ANNOTATIONS = "IAnnotationsDataModel.useAnnotations"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IUpdateModuleContextRootProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IUpdateModuleContextRootProperties.java
deleted file mode 100644
index 9df847f..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IUpdateModuleContextRootProperties.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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:
- * rfrost@bea.com - initial API and impl
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import org.eclipse.wst.web.internal.operation.IWebProjectPropertiesUpdateDataModelProperties;
-
-/**
- * Holds DataModelOperation properties for updating the context-root of modules in associated EAR application.xml files.
- */
-public interface IUpdateModuleContextRootProperties extends IWebProjectPropertiesUpdateDataModelProperties {
- /**
- * ID for nexted IDataModel
- */
- public static final String NESTED_MODEL_ID = "UpdateModuleContextRootModel"; //$NON-NLS-1$
- /**
- * Name of property (in nested model) that holds a List of EAR IProjects.
- */
- public static final String EARS_TO_UPDATE = "IUpdateModuleContextRootProperties.EARS_TO_UPDATE"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java
deleted file mode 100644
index 460e9de..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java
+++ /dev/null
@@ -1,228 +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.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-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.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public abstract class J2EEArtifactExportDataModelProvider extends AbstractDataModelProvider implements IJ2EEComponentExportDataModelProperties {
-
- public HashMap componentMap;
-
- public J2EEArtifactExportDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(COMPONENT_NAME);
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(ARCHIVE_DESTINATION);
- propertyNames.add(EXPORT_SOURCE_FILES);
- propertyNames.add(OVERWRITE_EXISTING);
- propertyNames.add(RUN_BUILD);
- propertyNames.add(COMPONENT);
- return propertyNames;
- }
-
- protected abstract String getProjectType();
-
- protected abstract String getWrongComponentTypeString(String projectName);
-
- protected abstract String getModuleExtension();
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(ARCHIVE_DESTINATION)) {
- return ""; //$NON-NLS-1$
- } else if (propertyName.equals(EXPORT_SOURCE_FILES)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(OVERWRITE_EXISTING)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(RUN_BUILD)) {
- return Boolean.TRUE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean set = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(COMPONENT_NAME)) {
- if (getComponentMap().isEmpty())
- intializeComponentMap();
- IVirtualComponent component = (IVirtualComponent) getComponentMap().get(propertyValue);
- if (null != component && component.getName().equals(propertyValue)) {
- setProperty(COMPONENT, component);
- setProperty(PROJECT_NAME, component.getProject().getName());
- } else {
- setProperty(COMPONENT, null);
- setProperty(PROJECT_NAME, null);
- }
- }
- return set;
- }
-
- public HashMap getComponentMap() {
- if (componentMap == null)
- componentMap = new HashMap();
- return componentMap;
- }
-
- public void intializeComponentMap() {
- IVirtualComponent[] comps = ComponentUtilities.getAllWorkbenchComponents();
- for (int i = 0; i < comps.length; i++) {
- getComponentMap().put(comps[i].getName(), comps[i]);
- }
- }
-
- /**
- * Populate the resource name combo with projects that are not encrypted.
- */
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- // TODO: populate valid components
- if (propertyName.equals(COMPONENT_NAME)) {
- List componentNames = new ArrayList();
- IVirtualComponent[] wbComps = ComponentUtilities.getAllWorkbenchComponents();
-
- List relevantComponents = new ArrayList();
- for (int i = 0; i < wbComps.length; i++) {
- if (J2EEProjectUtilities.getJ2EEProjectType(wbComps[i].getProject()).equals(getProjectType())) {
- relevantComponents.add(wbComps[i]);
- getComponentMap().put(wbComps[i].getName(), wbComps[i]);
- }
- }
-
- if (relevantComponents == null || relevantComponents.size() == 0)
- return null;
-
- for (int j = 0; j < relevantComponents.size(); j++) {
- componentNames.add(((IVirtualComponent) relevantComponents.get(j)).getName());
- }
- String[] names = (String[]) componentNames.toArray(new String[componentNames.size()]);
-
- return DataModelPropertyDescriptor.createDescriptors(names);
- }
- return super.getValidPropertyDescriptors(propertyName);
- // (ProjectUtilities.getProjectNamesWithoutForwardSlash((String[])
- // projectsWithNature.toArray(new String[projectsWithNature.size()])));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- public IStatus validate(String propertyName) {
- if (COMPONENT_NAME.equals(propertyName)) {
- String componentName = (String) model.getProperty(COMPONENT_NAME);
- if (componentName == null || componentName.equals("")) //$NON-NLS-1$
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_EXISTS_ERROR));
- IVirtualComponent component = (IVirtualComponent) componentMap.get(componentName);
- if (component == null) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_EXISTS_ERROR));
- }
- if (!J2EEProjectUtilities.getJ2EEProjectType(component.getProject()).equals(getProjectType())) {
- return WTPCommonPlugin.createErrorStatus(getWrongComponentTypeString(componentName));
- }
- }
- if (ARCHIVE_DESTINATION.equals(propertyName)) {
- String archiveLocation = (String) model.getProperty(ARCHIVE_DESTINATION);
- if (!model.isPropertySet(ARCHIVE_DESTINATION) || archiveLocation.equals("")) { //$NON-NLS-1$
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID)); //);
- } else if (model.isPropertySet(ARCHIVE_DESTINATION) && !validateModuleType(archiveLocation)) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_ARCHIVE_SHOULD_END_WITH, new Object[]{getModuleExtension()})); //);
- } else if (model.isPropertySet(ARCHIVE_DESTINATION)) {
- IStatus tempStatus = validateLocation(archiveLocation);
- if (tempStatus != OK_STATUS)
- return tempStatus;
- }
- }
- if (ARCHIVE_DESTINATION.equals(propertyName) || OVERWRITE_EXISTING.equals(propertyName)) {
- String location = (String) getProperty(ARCHIVE_DESTINATION);
- if (checkForExistingFileResource(location)) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.RESOURCE_EXISTS_ERROR, new Object[]{location}));
- }
- }
- return OK_STATUS;
- }
-
- private IStatus validateLocation(String archiveLocation) {
- IPath path = null;
- try {
- path = new Path(archiveLocation);
- } catch (IllegalArgumentException ex) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID));
- }
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(path.lastSegment(), IResource.FILE);
- if (!status.isOK()) {
- return status;
- }
- String device = path.getDevice();
- if (device == null)
- return OK_STATUS;
- if (path == null || device.length() == 1 && device.charAt(0) == IPath.DEVICE_SEPARATOR)
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID));
-
- if (!path.toFile().canWrite()) {
- if (path.toFile().exists()) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.IS_READ_ONLY));
- }
- boolean OK = false;
- path = path.removeLastSegments(1);
- for (int i = 1; !OK && i < 20 && path.segmentCount() > 0; i++) {
- if (path.toFile().exists()) {
- OK = true;
- }
- status = workspace.validateName(path.lastSegment(), IResource.FOLDER);
- if (!status.isOK()) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID));
- }
- path = path.removeLastSegments(1);
- }
- }
-
- return OK_STATUS;
- }
-
- private boolean checkForExistingFileResource(String fileName) {
- if (!model.getBooleanProperty(OVERWRITE_EXISTING)) {
- java.io.File externalFile = new java.io.File(fileName);
- if (externalFile != null && externalFile.exists())
- return true;
- }
- return false;
- }
-
- private boolean validateModuleType(String archive) {
- if ((archive.length() < 4) || (!(archive.substring(archive.length() - 4, archive.length()).equalsIgnoreCase(getModuleExtension())))) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
deleted file mode 100644
index 4b26ef7..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
+++ /dev/null
@@ -1,231 +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.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-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.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public abstract class J2EEArtifactImportDataModelProvider extends AbstractDataModelProvider implements IJ2EEComponentImportDataModelProperties, IDataModelListener {
-
- private static final String USE_DEFAULT_COMPONENT_NAME = "J2EEArtifactImportDataModelProvider.USE_DEFAULT_COMPONENT_NAME"; //$NON-NLS-1$
-
- /**
- * Extended attributes
- */
- protected static final String RUNTIME_TARGET_ID = IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID;
-
- private IDataModel componentCreationDM;
- private OpenFailureException cachedOpenFailureException = null;
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(FILE_NAME);
- propertyNames.add(FILE);
- propertyNames.add(SAVE_FILTER);
- propertyNames.add(OVERWRITE_HANDLER);
- propertyNames.add(CLOSE_ARCHIVE_ON_DISPOSE);
- propertyNames.add(USE_DEFAULT_COMPONENT_NAME);
- propertyNames.add(COMPONENT_NAME);
- return propertyNames;
- }
-
- public void init() {
- super.init();
- componentCreationDM = createJ2EEComponentCreationDataModel();
- componentCreationDM.setBooleanProperty(IComponentCreationDataModelProperties.CREATE_DEFAULT_FILES, false);
- componentCreationDM.addListener(this);
- model.addNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION, componentCreationDM);
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CLOSE_ARCHIVE_ON_DISPOSE)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(USE_DEFAULT_COMPONENT_NAME)) {
- return Boolean.TRUE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- private boolean settingFileName = false;
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (propertyName.equals(FILE)) {
- if (!settingFileName) {
- setProperty(FILE_NAME, null);
- }
- updateDefaultComponentName();
- return true;
- } else if (propertyName.equals(SAVE_FILTER) && getArchiveFile() != null) {
- getArchiveFile().setSaveFilter(getSaveFilter());
- } else if (FILE_NAME.equals(propertyName)) {
- try {
- cachedOpenFailureException = null;
- handleArchiveSetup((String) propertyValue);
- } catch (OpenFailureException oe) {
- cachedOpenFailureException = oe;
- }
- } else if (COMPONENT_NAME.equals(propertyName)) {
- List nestedModels = new ArrayList(model.getNestedModels());
- IDataModel nestedModel = null;
- for (int i = 0; i < nestedModels.size(); i++) {
- nestedModel = (IDataModel) nestedModels.get(i);
- try {
- nestedModel.setProperty(IJ2EEComponentImportDataModelProperties.COMPONENT_NAME, propertyValue);
- } catch (Exception e) {}
- }
- setProperty(PROJECT_NAME,propertyValue);
- }
- return true;
- }
-
- private boolean doingComponentUpdate;
-
- private void updateDefaultComponentName() {
- Archive archive = getArchiveFile();
- if (null != archive && getBooleanProperty(USE_DEFAULT_COMPONENT_NAME)) {
- try {
- doingComponentUpdate = true;
- Path path = new Path(archive.getURI());
- String defaultProjectName = path.segment(path.segmentCount() - 1);
- if (defaultProjectName.indexOf('.') > 0) {
- defaultProjectName = defaultProjectName.substring(0, defaultProjectName.lastIndexOf('.'));
- }
- setProperty(COMPONENT_NAME, defaultProjectName);
- } finally {
- doingComponentUpdate = false;
- }
-
- }
- }
-
- private boolean handleArchiveSetup(String fileName) throws OpenFailureException {
- try {
- settingFileName = true;
- Archive archive = getArchiveFile();
- if (archive != null) {
- archive.close();
- setProperty(FILE, null);
- }
- String uri = getStringProperty(FILE_NAME);
- if (!archiveExistsOnFile())
- return false;
- archive = openArchive(uri);
- if (null != archive) {
- archive.setSaveFilter(getSaveFilter());
- }
- setProperty(FILE, archive);
- return archive != null;
- } finally {
- settingFileName = false;
- }
-
- }
-
- protected abstract Archive openArchive(String uri) throws OpenFailureException;
-
- private boolean closeModuleFile() {
- if (null != getArchiveFile()) {
- getArchiveFile().close();
- }
- return true;
- }
-
- public IStatus validate(String propertyName) {
- if (FILE_NAME.equals(propertyName) && !isPropertySet(FILE)) {
- String fileName = getStringProperty(propertyName);
- if (fileName == null || fileName.length() == 0) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.ARCHIVE_FILE_NAME_EMPTY_ERROR, new Object[]{ArchiveUtil.getModuleFileTypeName(getType())}));
- } else if (cachedOpenFailureException != null) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(cachedOpenFailureException.getMessage()));
- } else if (fileName != null && !archiveExistsOnFile()) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.FILE_DOES_NOT_EXIST_ERROR, new Object[]{ArchiveUtil.getModuleFileTypeName(getType())}));
- }
- }
- return OK_STATUS;
- }
-
- protected int getJ2EEVersion() {
- return 0;
- }
-
- protected abstract IDataModel createJ2EEComponentCreationDataModel();
-
- /*
- * @see XMLResource#APP_CLIENT_TYPE
- * @see XMLResource#APPLICATION_TYPE
- * @see XMLResource#EJB_TYPE
- * @see XMLResource#WEB_APP_TYPE
- * @see XMLResource#RAR_TYPE
- */
- protected abstract int getType();
-
- private boolean archiveExistsOnFile() {
- String jarName = (String) getProperty(FILE_NAME);
- if (jarName != null && jarName.length() > 0) {
- java.io.File file = new java.io.File(jarName);
- return file.exists() && !file.isDirectory();
- }
- return false;
- }
-
- public void dispose() {
- if (getBooleanProperty(CLOSE_ARCHIVE_ON_DISPOSE))
- closeModuleFile();
- super.dispose();
- }
-
- protected final void setArchiveFile(Archive archiveFile) {
- setProperty(FILE, archiveFile);
- }
-
- protected final Archive getArchiveFile() {
- return (Archive) getProperty(FILE);
- }
-
- protected final ArchiveOptions getArchiveOptions() {
- ArchiveOptions opts = new ArchiveOptions();
- opts.setIsReadOnly(true);
- return opts;
- }
-
- private SaveFilter getSaveFilter() {
- return (SaveFilter) getProperty(SAVE_FILTER);
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- public void propertyChanged(DataModelEvent event) {
- if (!doingComponentUpdate && event.getDataModel() == componentCreationDM && event.getPropertyName().equals(COMPONENT_NAME) && getBooleanProperty(USE_DEFAULT_COMPONENT_NAME)) {
- setBooleanProperty(USE_DEFAULT_COMPONENT_NAME, false);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModelProvider.java
deleted file mode 100644
index 58e5635..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,779 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public abstract class J2EEComponentCreationDataModelProvider extends JavaComponentCreationDataModelProvider implements IJ2EEComponentCreationDataModelProperties, IAnnotationsDataModel {
-
- private IDataModel earCreationDM = null;
- private static String MODULE_NOT_SUPPORTED = "MODULE_NOT_SUPPORTED"; //$NON-NLS-1$
- private static String MODULEVERSION_NOT_SUPPORTED = "VERSION_NOT_SUPPORTED"; //$NON-NLS-1$
- private static String OK = "OK"; //$NON-NLS-1$
-
- public void init() {
- super.init();
- model.setProperty(COMPONENT_VERSION, getDefaultProperty(COMPONENT_VERSION));
-
- IDataModel dm = DataModelFactory.createDataModel(createAddComponentToEAR());
- model.setProperty(NESTED_ADD_COMPONENT_TO_EAR_DM, dm);
- propertySet(CLASSPATH_SELECTION, null);
- model.setProperty(NESTED_UPDATE_MANIFEST_DM, DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class));
- model.setProperty(USE_ANNOTATIONS, Boolean.FALSE);
- }
-
- public AddComponentToEnterpriseApplicationDataModelProvider createAddComponentToEAR() {
- return new AddComponentToEnterpriseApplicationDataModelProvider();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EAR_COMPONENT_NAME);
- propertyNames.add(EAR_COMPONENT_DEPLOY_NAME);
- propertyNames.add(ADD_TO_EAR);
- propertyNames.add(UI_SHOW_EAR_SECTION);
- propertyNames.add(DD_FOLDER);
- propertyNames.add(COMPONENT_VERSION);
- propertyNames.add(VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME);
- propertyNames.add(NESTED_ADD_COMPONENT_TO_EAR_DM);
- propertyNames.add(CLASSPATH_SELECTION);
- propertyNames.add(NESTED_EAR_COMPONENT_CREATION_DM);
- propertyNames.add(NESTED_UPDATE_MANIFEST_DM);
- propertyNames.add(EAR_COMPONENT_PROJECT);
- propertyNames.add(USE_ANNOTATIONS);
- propertyNames.add(MODULE_URI);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(ADD_TO_EAR)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(UI_SHOW_EAR_SECTION)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(EAR_COMPONENT_NAME)) {
- return getDataModel().getStringProperty(COMPONENT_NAME) + "EAR"; //$NON-NLS-1$
- } else if (propertyName.equals(COMPONENT_VERSION)) {
- return getDefaultComponentVersion();
- } else if (propertyName.equals(NESTED_EAR_COMPONENT_CREATION_DM))
- return getDefaultEarCreationDM();
- return super.getDefaultProperty(propertyName);
- }
-
- private Object getDefaultEarCreationDM() {
- if (earCreationDM == null) {
- earCreationDM = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
- setProperty(NESTED_EAR_COMPONENT_CREATION_DM, earCreationDM);
- }
- return earCreationDM;
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (EAR_COMPONENT_NAME.equals(propertyName)) {
- return getBooleanProperty(ADD_TO_EAR);
- } else if (RUNTIME_TARGET_ID.equals(propertyName)) {
- if (getBooleanProperty(ADD_TO_EAR)) {
- IStatus status = validateEAR(model.getStringProperty(EAR_COMPONENT_NAME));
- if (status.isOK()) {
- IProject earProject = ProjectUtilities.getProject(getStringProperty(EAR_COMPONENT_NAME));
- if (earProject != null && earProject.exists()) {
- IFacetedProject facetdEarProject;
- try {
- facetdEarProject = ProjectFacetsManager.create(earProject);
- if (facetdEarProject != null) {
- return false;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- }
- }
- return true;
- }
- return super.isPropertyEnabled(propertyName);
- }
-
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean status = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(EAR_COMPONENT_NAME)) {
- model.setProperty(EAR_COMPONENT_DEPLOY_NAME, propertyValue);
- IProject earProj = getEARProject();
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- earDM.setProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT, earProj);
- model.setProperty(EAR_COMPONENT_PROJECT, earProj);
-
- } else if (propertyName.equals(COMPONENT_NAME)) {
-
- if (getBooleanProperty(ADD_TO_EAR)) {
- if (!model.isPropertySet(EAR_COMPONENT_NAME)) {
- model.notifyPropertyChange(EAR_COMPONENT_NAME, IDataModel.VALID_VALUES_CHG);
- model.setProperty(EAR_COMPONENT_DEPLOY_NAME, getProperty(EAR_COMPONENT_NAME));
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- IProject earProject = getEARProject();
- model.setProperty(EAR_COMPONENT_PROJECT, earProject);
- if (earDM != null && earProject != null)
- earDM.setProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT, earProject);
- }
- }
- } else if (propertyName.equals(ADD_TO_EAR)) {
- model.notifyPropertyChange(EAR_COMPONENT_NAME, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(NESTED_EAR_COMPONENT_CREATION_DM, IDataModel.DEFAULT_CHG);
- IProject earProj = getEARProject();
- model.setProperty(EAR_COMPONENT_PROJECT, earProj);
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- if (earDM != null && earProj != null) {
- earDM.setProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT, earProj);
- earDM.setProperty(COMPONENT_VERSION, new Integer(getJ2EEVersion()));
- }
-
- } else if (propertyName.equals(COMPONENT_VERSION)) {
- if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
- setProperty(USE_ANNOTATIONS, Boolean.FALSE);
- model.notifyPropertyChange(USE_ANNOTATIONS, DataModelEvent.ENABLE_CHG);
- model.notifyPropertyChange(EAR_COMPONENT_NAME, DataModelEvent.VALID_VALUES_CHG);
- if (getBooleanProperty(ADD_TO_EAR)) {
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- earDM.setProperty(COMPONENT_VERSION, new Integer(getJ2EEVersion()));
- }
- // this will force to reload all the server types which are valid for this component
- // version
- model.notifyPropertyChange(RUNTIME_TARGET_ID, DataModelEvent.VALID_VALUES_CHG);
- } else if (RUNTIME_TARGET_ID.equals(propertyName)) {
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- earDM.setProperty(RUNTIME_TARGET_ID, propertyValue);
- }
-
- if (EAR_COMPONENT_NAME.equals(propertyName) || ADD_TO_EAR.equals(propertyName)) {
- if (getBooleanProperty(ADD_TO_EAR)) {
- IStatus astatus = validateEAR(model.getStringProperty(EAR_COMPONENT_NAME));
- if (astatus.isOK()) {
- IProject earProject = ProjectUtilities.getProject(getStringProperty(EAR_COMPONENT_NAME));
- if (earProject != null && earProject.exists()) {
- IFacetedProject facetdEarProject;
- try {
- facetdEarProject = ProjectFacetsManager.create(earProject);
- if (facetdEarProject != null) {
- if(facetdEarProject.getRuntime()== null){
- setProperty(RUNTIME_TARGET_ID, "");
- } else {
- setProperty(RUNTIME_TARGET_ID, facetdEarProject.getRuntime().getName());
- }
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- }
- }
- model.notifyPropertyChange(RUNTIME_TARGET_ID, IDataModel.ENABLE_CHG);
- }
- return status;
- }
-
- protected IProject getEARProject() {
- String earProjname = (String) model.getProperty(EAR_COMPONENT_NAME);
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- earDM.setProperty(IComponentCreationDataModelProperties.PROJECT_NAME, earProjname);
-
- if (earProjname != null && !earProjname.equals("") && validate(EAR_COMPONENT_NAME).isOK()) //$NON-NLS-1$
- return ProjectUtilities.getProject(earProjname);
- return null;
- }
-
- protected IStatus validateEAR(String earName) {
- if (earName == null || earName.equals("")) { //$NON-NLS-1$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- if (earName.indexOf("#") != -1 || earName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- return (ProjectCreationDataModelProviderNew.validateProjectName(earName));
- }
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName){
- if (propertyName.equals(RUNTIME_TARGET_ID)) {
- String propertyValue = (String)getProperty(propertyName);
- if( propertyValue != null ){
- IRuntime runtime = getServerTargetByID(propertyValue);
- if( runtime != null )
- return new DataModelPropertyDescriptor(propertyValue, runtime.getName());
- }
- }
- return super.getPropertyDescriptor(propertyName);
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (propertyName.equals(COMPONENT_VERSION)) {
- return getValidComponentVersionDescriptors();
- }
- if (propertyName.equals(EAR_COMPONENT_NAME)) {
- int j2eeVersion = getJ2EEVersion();
- return getEARPropertyDescriptor(j2eeVersion);
- } else if (propertyName.equals(RUNTIME_TARGET_ID)) {
- return validJ2EEServerPropertyDescriptors();
- }
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- protected String isvalidJComponentVersionsSupportedByServer() {
- String serverID = model.getStringProperty(RUNTIME_TARGET_ID);
- IRuntime runtime = getServerTargetByID(serverID);
-
- if (serverID.equals("") || runtime == null) { //$NON-NLS-1$
- return MODULEVERSION_NOT_SUPPORTED;
- }
- Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
- String j2eeVer = J2EEVersionUtil.convertVersionIntToString(version.intValue());
- return isTypeSupported(runtime.getRuntimeType(), getJ2EEProjectType(), j2eeVer);
- }
-
- protected abstract String getJ2EEProjectType();
-
- protected DataModelPropertyDescriptor[] validJ2EEServerPropertyDescriptors() {
-
- Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
- //int j2eeversion = convertModuleVersionToJ2EEVersion(version.intValue());
- String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString(version.intValue());
-
- ArrayList validServers = new ArrayList();
-
- IDataModel projectdm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
- DataModelPropertyDescriptor[] desc = projectdm.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
- for (int i = 0; i < desc.length; i++) {
- DataModelPropertyDescriptor descriptor = desc[i];
- String runtimeid = (String) descriptor.getPropertyValue();
- IRuntime runtime = getServerTargetByID(runtimeid);
- String ok = isTypeSupported(runtime.getRuntimeType(), getJ2EEProjectType(), j2eeVersionText);
- if (ok.equals(OK))
- validServers.add(descriptor);
- }
-
- if (!validServers.isEmpty()) {
- int serverTargetListSize = validServers.size()+1;
- DataModelPropertyDescriptor[] result = new DataModelPropertyDescriptor[serverTargetListSize];
- for (int i = 0; i < validServers.size(); i++) {
- result[i] = (DataModelPropertyDescriptor) validServers.get(i);
- }
- result[result.length -1] = new DataModelPropertyDescriptor(null, "");
- return result;
- }
- return new DataModelPropertyDescriptor[0];
- }
-
- protected IRuntime getServerTargetByID(String id) {
- IRuntime[] targets = ServerUtil.getRuntimes("", ""); //$NON-NLS-1$ //$NON-NLS-2$
- for (int i = 0; i < targets.length; i++) {
- IRuntime target = targets[i];
- if (id.equals(target.getId()))
- return target;
- }
- return null;
- }
-
-// private List getValidServerTargets() {
-// List validServerTargets = null;
-// validServerTargets = ServerTargetHelper.getServerTargets("", ""); //$NON-NLS-1$ //$NON-NLS-2$
-// if (validServerTargets != null && validServerTargets.isEmpty())
-// validServerTargets = null;
-// if (validServerTargets == null)
-// return Collections.EMPTY_LIST;
-// return validServerTargets;
-// }
-
-
- protected String isTypeSupported(IRuntimeType type, String moduleID, String j2eeVersion) {
- IModuleType[] moduleTypes = type.getModuleTypes();
-
- boolean moduleFound = false;
- boolean moduleVersionFound = false;
-
- if (moduleTypes != null) {
- int size = moduleTypes.length;
-
- for (int i = 0; i < size; i++) {
- IModuleType moduleType = moduleTypes[i];
-
- if (matches(moduleType.getId(), moduleID)) {
- moduleFound = true;
- String version = moduleType.getVersion();
- if (version.equals(j2eeVersion) || version.equals("*")) { //$NON-NLS-1$
- moduleVersionFound = true;
- return OK;
- }
- if (i < size)
- continue;
- }
- }
- }
- if (!moduleFound)
- return MODULE_NOT_SUPPORTED;
- if (!moduleVersionFound)
- return MODULEVERSION_NOT_SUPPORTED;
- return ""; //$NON-NLS-1$
- }
-
-
- protected static String[] getServerVersions(IRuntimeType type, String moduleID) {
- List list = new ArrayList();
- if (type == null)
- return null;
- IModuleType[] moduleTypes = type.getModuleTypes();
- if (moduleTypes != null) {
- int size = moduleTypes.length;
- for (int i = 0; i < size; i++) {
- IModuleType moduleType = moduleTypes[i];
- if (matches(moduleType.getId(), moduleID)) {
- list.add(moduleType.getVersion());
- }
-
- }
- }
- String[] versions = null;
- if (!list.isEmpty()) {
- versions = new String[list.size()];
- list.toArray(versions);
- }
- return versions;
- }
-
- protected static boolean matches(String serverTypeID, String j2eeModuleID) {
-
- if (serverTypeID.equals("jst") || serverTypeID.equals("jst.*")) //$NON-NLS-1$ //$NON-NLS-2$
- return j2eeModuleID.equals(J2EEProjectUtilities.DYNAMIC_WEB) || j2eeModuleID.equals(J2EEProjectUtilities.EJB) || j2eeModuleID.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION) || j2eeModuleID.equals(J2EEProjectUtilities.APPLICATION_CLIENT) || j2eeModuleID.equals(J2EEProjectUtilities.JCA);
-
- else if (serverTypeID.equals(J2EEProjectUtilities.DYNAMIC_WEB))
- return j2eeModuleID.equals(J2EEProjectUtilities.DYNAMIC_WEB);
-
- else if (serverTypeID.equals(J2EEProjectUtilities.EJB))
- return j2eeModuleID.equals(J2EEProjectUtilities.EJB);
-
- else if (serverTypeID.equals(J2EEProjectUtilities.JCA))
- return j2eeModuleID.equals(J2EEProjectUtilities.JCA);
-
- else if (serverTypeID.equals(J2EEProjectUtilities.APPLICATION_CLIENT))
- return j2eeModuleID.equals(J2EEProjectUtilities.APPLICATION_CLIENT);
-
- else if (serverTypeID.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION))
- return j2eeModuleID.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION) || j2eeModuleID.equals(J2EEProjectUtilities.APPLICATION_CLIENT) || j2eeModuleID.equals(J2EEProjectUtilities.JCA);
-
- return false;
- }
-
-
-
- private DataModelPropertyDescriptor[] getEARPropertyDescriptor(int j2eeVersion) {
- StructureEdit mc = null;
- ArrayList earDescriptorList = new ArrayList();
-
- IProject[] projs = ProjectUtilities.getAllProjects();
-
- for (int index = 0; index < projs.length; index++) {
- IProject flexProject = projs[index];
- try {
- if (flexProject != null) {
- if (ModuleCoreNature.isFlexibleProject(flexProject)) {
- IVirtualComponent comp = ComponentCore.createComponent(flexProject);
- if (J2EEProjectUtilities.isEARProject(comp.getProject())) {
- String sVer = J2EEProjectUtilities.getJ2EEProjectVersion(comp.getProject());
- int ver = J2EEVersionUtil.convertVersionStringToInt(sVer);
- if (j2eeVersion <= ver) {
- DataModelPropertyDescriptor desc = new DataModelPropertyDescriptor(comp.getProject().getName());
- earDescriptorList.add(desc);
- }
- }
- }
- }
- } finally {
- if (mc != null)
- mc.dispose();
- }
- }
- DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[earDescriptorList.size()];
- for (int i = 0; i < descriptors.length; i++) {
- DataModelPropertyDescriptor desc = (DataModelPropertyDescriptor) earDescriptorList.get(i);
- descriptors[i] = new DataModelPropertyDescriptor(desc.getPropertyDescription(), desc.getPropertyDescription());
- }
- return descriptors;
- }
-
-
-
- public IProject getProject() {
- String projName = getDataModel().getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- if (projName != null && projName.length() > 0)
- return ProjectUtilities.getProject(projName);
- return null;
- }
-
- public WorkbenchComponent getTargetWorkbenchComponent() {
- StructureEdit core = null;
- try {
- IProject flexProject = getProject();
- if (flexProject != null) {
- core = StructureEdit.getStructureEditForRead(getProject());
- if (core != null) {
- String componentName = getProperty(COMPONENT_NAME) != null ? getProperty(COMPONENT_NAME).toString() : null;
- if (componentName != null)
- return core.getComponent();
- }
- }
- } finally {
- if (core != null)
- core.dispose();
- }
- return null;
- }
-
- protected boolean isEARSupported() {
- if (this instanceof EarComponentCreationDataModelProvider)
- return false;
- String serverID = model.getStringProperty(RUNTIME_TARGET_ID);
- IRuntime runtime = getServerTargetByID(serverID);
- Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
- int nj2eeVer = convertModuleVersionToJ2EEVersion(version.intValue());
- String j2eeVer = J2EEVersionUtil.getJ2EETextVersion(nj2eeVer);
-
- if (runtime != null) {
- String msg = isTypeSupported(runtime.getRuntimeType(), J2EEProjectUtilities.ENTERPRISE_APPLICATION, j2eeVer);
- if (msg.equals(OK)) {
- return true;
- }
- }
- return false;
- }
-
- protected boolean validateComponentAlreadyInEar() {
- //IVirtualComponent component = ComponentCore.createComponent(getProject(), getModuleName());
-
- IProject earProj = (IProject) model.getProperty(EAR_COMPONENT_PROJECT);
- if (earProj != null && earProj.exists()) {
- IVirtualComponent earComp = ComponentCore.createComponent(earProj);
- if (earComp != null && earComp.exists()) {
- IVirtualReference[] refs = earComp.getReferences();
- for (int i = 0; i < refs.length; i++) {
- IVirtualReference ref = refs[i];
- IVirtualComponent referencedComp = ref.getReferencedComponent();
- if (referencedComp.getName().equalsIgnoreCase(getModuleName()))
- return true;
- }
- }
- }
- return false;
- }
-
- public IStatus validate(String propertyName) {
- if (EAR_COMPONENT_NAME.equals(propertyName) && getBooleanProperty(ADD_TO_EAR)) {
- return validateEARModuleNameProperty();
- } else if (COMPONENT_VERSION.equals(propertyName)) {
- return validateComponentVersionProperty();
- } else if (propertyName.equals(VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME)) {
- return OK_STATUS;
- } else if (propertyName.equals(ADD_TO_EAR)) {
- boolean val = getBooleanProperty(ADD_TO_EAR);
- if (val) {
- String serverID = model.getStringProperty(RUNTIME_TARGET_ID);
- IRuntime runtime = getServerTargetByID(serverID);
- if (serverID.equals("") || runtime == null) { //$NON-NLS-1$
- return OK_STATUS;
- }
- Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
- int nj2eeVer = convertModuleVersionToJ2EEVersion(version.intValue());
- String j2eeVer = J2EEVersionUtil.getJ2EETextVersion(nj2eeVer);
- String msg = isTypeSupported(runtime.getRuntimeType(), J2EEProjectUtilities.ENTERPRISE_APPLICATION, j2eeVer);
- if (!msg.equals(OK)) {
- msg = EARCreationResourceHandler.SERVER_TARGET_NOT_SUPPORT_EAR;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (validateComponentAlreadyInEar()) {
- msg = J2EECreationResourceHandler.COMPONENT_ALREADYINEAR;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- } else if (propertyName.equals(PROJECT_NAME)) {
- if (!isCreatingEarComponent()) {
- String projName = getDataModel().getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- IProject earProj = (IProject) earDM.getProperty(EAR_COMPONENT_PROJECT);
- if (earProj != null) {
- String earProjName = earProj.getName();
- if (earProjName.equalsIgnoreCase(projName)) {
- String msg = msg = EARCreationResourceHandler.EAR_PROJECTNAME_SAMEAS_MODULE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- }
- }
- return super.validate(propertyName);
- }
-
- protected boolean isCreatingEarComponent() {
- return false;
- }
-
- private IStatus validateComponentVersionProperty() {
- int componentVersion = model.getIntProperty(COMPONENT_VERSION);
- String result = isvalidJComponentVersionsSupportedByServer();
- if (result.equals(MODULEVERSION_NOT_SUPPORTED)) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SPEC_LEVEL_NOT_FOUND));
- } else if (result.equals(MODULE_NOT_SUPPORTED)) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_NOT_SUPPORTED));
- }
- if (componentVersion == -1)
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SPEC_LEVEL_NOT_FOUND));
- return OK_STATUS;
- }
-
- private IStatus validateEARModuleNameProperty() {
- IStatus status = OK_STATUS;
- String earName = getStringProperty(EAR_COMPONENT_NAME);
- if (status.isOK()) {
- if (earName.indexOf("#") != -1 || earName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- } else if (earName == null || earName.equals("")) { //$NON-NLS-1$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- } else
- return status;
- // IProject earProject =
- // applicationCreationDataModel.getTargetProject();
- // if (null != earProject && earProject.exists()) {
- // if (earProject.isOpen()) {
- // try {
- // EARNatureRuntime earNature = (EARNatureRuntime)
- // earProject.getNature(IEARNatureConstants.NATURE_ID);
- // if (earNature == null) {
- // return
- // WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_NOT_EAR,
- // new Object[]{earProject.getName()}));
- // } else if (earNature.getJ2EEVersion() < getJ2EEVersion()) {
- // String earVersion =
- // EnterpriseApplicationCreationDataModel.getVersionString(earNature.getJ2EEVersion());
- // return
- // WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.INCOMPATABLE_J2EE_VERSIONS,
- // new Object[]{earProject.getName(), earVersion}));
- // }
- // return OK_STATUS;
- // } catch (CoreException e) {
- // return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, -1, null, e);
- // }
- // }
- // return
- // WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_ClOSED,
- // new Object[]{earProject.getName()}));
- // } else if (null != earProject && null != getTargetProject()) {
- // if (earProject.getName().equals(getTargetProject().getName())) {
- // return
- // WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME,
- // new Object[]{earProject.getName()}));
- // } else if (!CoreFileSystemLibrary.isCaseSensitive()) {
- // if
- // (earProject.getName().toLowerCase().equals(getTargetProject().getName().toLowerCase()))
- // {
- // return
- // WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME,
- // new Object[]{earProject.getName()}));
- // }
- // }
- // }
- // IStatus status =
- // applicationCreationDataModel.validateProperty(EnterpriseApplicationCreationDataModel.PROJECT_NAME);
- // if (status.isOK()) {
- // status =
- // applicationCreationDataModel.validateProperty(EnterpriseApplicationCreationDataModel.PROJECT_LOCATION);
- // }
- // return status;
-
- return WTPCommonPlugin.OK_STATUS;
- }
-
- public final ClassPathSelection getClassPathSelection() {
- // boolean createNew = false;
- // if (null == cachedSelection ||
- // !getApplicationCreationDataModel().getTargetProject().getName().equals(cachedSelection.getEARFile().getURI()))
- // {
- // createNew = true;
- // }
- // // close an existing cachedSelection
- // if (createNew && cachedSelection != null) {
- // EARFile earFile = cachedSelection.getEARFile();
- // if (earFile != null)
- // earFile.close();
- // }
- //
- // if (createNew && getTargetProject() != null) {
- // cachedSelection =
- // ClasspathSelectionHelper.createClasspathSelection(getTargetProject(),
- // getModuleExtension(),
- // getApplicationCreationDataModel().getTargetProject(),
- // getModuleType());
- // }
- // return cachedSelection;
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#dispose()
- */
- public void dispose() {
- super.dispose();
- }
-
- // public void propertyChanged(WTPOperationDataModelEvent event) {
- // super.propertyChanged(event);
- // if (event.getDataModel() == addComponentToEARDataModel && event.getFlag()
- // == WTPOperationDataModelEvent.PROPERTY_CHG &&
- // event.getPropertyName().equals(ArtifactEditOperationDataModel.PROJECT_NAME))
- // {
- // earComponentCreationDataModel.setProperty(EARComponentCreationDataModel.COMPONENT_NAME,
- // event.getProperty());
- // }
- // }
- protected final IDataModel getAddComponentToEARDataModel() {
- // return (AddComponentToEnterpriseApplicationDataModel)
- // model.getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- return (IDataModel) model.getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- }
-
- protected final IDataModel getUpdateManifestDataModel() {
- return (IDataModel) model.getProperty(NESTED_UPDATE_MANIFEST_DM);
- }
-
- public String getModuleName() {
- return getDataModel().getStringProperty(COMPONENT_NAME);
- }
-
- public final int getJ2EEVersion() {
- return convertModuleVersionToJ2EEVersion(getIntProperty(COMPONENT_VERSION));
- }
-
- /**
- * Subclasses should override to convert the j2eeVersion to a module version id. By default we
- * return the j2eeVersion which is fine if no conversion is necessary.
- *
- * @param integer
- * @return
- */
- protected Integer convertJ2EEVersionToModuleVersion(Integer j2eeVersion) {
- return j2eeVersion;
- }
-
- protected abstract int convertModuleVersionToJ2EEVersion(int moduleVersion);
-
- protected abstract DataModelPropertyDescriptor[] getValidComponentVersionDescriptors();
-
-
-// private DataModelPropertyDescriptor[] validExistingProjectsDescriptors() {
-//
-// IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
-// List items = new ArrayList();
-// for (int i = 0; i < workspaceProjects.length; i++) {
-// IProject project = workspaceProjects[i];
-// try {
-// if (project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-// items.add(project.getName());
-// }
-// } catch (CoreException ce) {
-// // Ignore
-// }
-// }
-//
-// DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[items.size()];
-// for (int i = 0; i < descriptors.length; i++) {
-// descriptors[i] = new DataModelPropertyDescriptor(items.get(i));
-// }
-// return descriptors;
-//
-//
-// // StructureEdit mc = null;
-// // ArrayList earDescriptorList = new ArrayList();
-// //
-// // IProject[] projs = ProjectUtilities.getAllProjects();
-// //
-// // for (int index = 0; index < projs.length; index++) {
-// // IProject flexProject = projs[index];
-// // try {
-// // if (flexProject != null) {
-// // IFlexibleProject fProject = ComponentCore.createFlexibleProject(flexProject);
-// // if ( fProject.isFlexible()){
-// // IVirtualComponent[] comps = fProject.getComponents();
-// // int earVersion = 0;
-// // for( int i=0; i< comps.length; i++ ){
-// // if( comps[i].getComponentTypeId().equals(IModuleConstants.JST_EAR_MODULE)){
-// // String sVer = comps[i].getVersion();
-// // int ver = J2EEVersionUtil.convertVersionStringToInt(sVer);
-// // if (j2eeVersion <= ver) {
-// // DataModelPropertyDescriptor desc = new
-// // DataModelPropertyDescriptor(comps[i].getComponentHandle(), comps[i].getName());
-// // earDescriptorList.add(desc);
-// // }
-// // }
-// // }
-// // }
-// // }
-// // } finally {
-// // if (mc != null)
-// // mc.dispose();
-// // }
-// // }
-// // DataModelPropertyDescriptor[] descriptors = new
-// // DataModelPropertyDescriptor[earDescriptorList.size()];
-// // for (int i = 0; i < descriptors.length; i++) {
-// // DataModelPropertyDescriptor desc = (DataModelPropertyDescriptor)earDescriptorList.get(i);
-// // descriptors[i] = new DataModelPropertyDescriptor(desc.getPropertyDescription(),
-// // desc.getPropertyDescription());
-// // }
-// // return descriptors;
-//
-//
-// }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentExportDataModelProvider.java
deleted file mode 100644
index b302081..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,18 +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.jst.j2ee.application.internal.operations;
-
-public abstract class J2EEComponentExportDataModelProvider extends J2EEArtifactExportDataModelProvider {
-
- public J2EEComponentExportDataModelProvider() {
- super();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentImportDataModelProvider.java
deleted file mode 100644
index 2451b31..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,61 +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.jst.j2ee.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * This dataModel is a common super class used to import J2EE Modules.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public abstract class J2EEComponentImportDataModelProvider extends J2EEArtifactImportDataModelProvider implements IJ2EEModuleImportDataModelProperties {
-
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EXTENDED_IMPORT_FACTORY);
- return propertyNames;
- }
-
- private int getModuleSpecVersion() {
- if (!isPropertySet(EXTENDED_IMPORT_FACTORY)) {
- return ArchiveUtil.getFastSpecVersion(getModuleFile());
- }
- ExtendedImportFactory factory = (ExtendedImportFactory) getProperty(EXTENDED_IMPORT_FACTORY);
- return factory.getSpecVersion(getModuleFile());
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean set = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(FILE)) {
- IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- if (getModuleFile() != null) {
- moduleDM.setIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION, getModuleSpecVersion());
- model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- }
- }
- return set;
- }
-
- protected ModuleFile getModuleFile() {
- return (ModuleFile) getArchiveFile();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModelProvider.java
deleted file mode 100644
index 16e4ff0..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModelProvider.java
+++ /dev/null
@@ -1,60 +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
- *******************************************************************************/
-/*
- * Created on Dec 15, 2003
- *
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaUtilityJarImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public final class J2EEUtilityJarImportDataModelProvider extends J2EEArtifactImportDataModelProvider implements IJavaUtilityJarImportDataModelProperties {
-
- public static String J2EE_UTILITY_JAR_IMPORT_DMP_ID = "j2eeUtilityJarImportDataModelProvider";
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EAR_COMPONENT_NAME);
- propertyNames.add(EAR_PROJECT_NAME);
- return propertyNames;
- }
-
- protected Archive openArchive(String uri) throws OpenFailureException {
- return null;
- }
-
- protected int getType() {
- return 0;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new J2EEUtilityJarImportOperationNew(model);
- }
-
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new JavaComponentCreationDataModelProvider());
- }
-
- public String getID() {
-
- return J2EE_UTILITY_JAR_IMPORT_DMP_ID;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperationNew.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperationNew.java
deleted file mode 100644
index 8896587..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperationNew.java
+++ /dev/null
@@ -1,133 +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.jst.j2ee.application.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEJavaComponentSaveStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEUtilityJarImportOperationNew extends AbstractDataModelOperation {
-
- public J2EEUtilityJarImportOperationNew(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IDataModel utilityCreationDataModel = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
- String projectName = model.getStringProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME);
- utilityCreationDataModel.setStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- String runtime = model.getStringProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID);
- IRuntime facetRuntime = null;
- try {
- runtime = ServerCore.findRuntime(runtime).getName();
- facetRuntime = RuntimeManager.getRuntime(runtime);
- } catch (Exception e) {
- // proceed with facetRuntime = null
- }
- utilityCreationDataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetRuntime);
- FacetDataModelMap map = (FacetDataModelMap)utilityCreationDataModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.getFacetDataModel(J2EEProjectUtilities.UTILITY).setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
-
- utilityCreationDataModel.getDefaultOperation().execute(monitor, info);
-
- IProject javaProject = ProjectUtilities.getProject(projectName);
- IVirtualComponent component = ComponentCore.createComponent(javaProject);
-
- Archive jarFile = (Archive) model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-
- J2EEJavaComponentSaveStrategyImpl strat = new J2EEJavaComponentSaveStrategyImpl(component);
-
- strat.setProgressMonitor(new SubProgressMonitor(monitor, 1));
- try {
- jarFile.save(strat);
- // To fix the defect that throws dup classpath exception.
- // Because JemProjectUtilities.appendJavaClassPath() does not check dups, we have to
- // check it here.
- // check if JRE_CONTAINER is in the classpath. if not add it
- IJavaProject javaProj = JemProjectUtilities.getJavaProject(javaProject);
- IClasspathEntry[] classpath = javaProj.getRawClasspath();
- String jrePathName = "org.eclipse.jdt.launching.JRE_CONTAINER"; //$NON-NLS-1$
- boolean exists = false;
- for (int i = 0; i < classpath.length; i++) {
- if (classpath[i].getEntryKind() != IClasspathEntry.CPE_CONTAINER)
- continue;
- IPath path = classpath[i].getPath();
- if (path.segmentCount() > 0) {
- String name = path.segment(0).toString();
- if (jrePathName.equals(name)) {
- exists = true;
- break;
- }
- }
- }
- if (!exists) {
- /**
- * Warning clean-up 12/05/2005
- */
- //IClasspathEntry newEntry = JavaCore.newContainerEntry(new Path(jrePathName));
- JemProjectUtilities.appendJavaClassPath(javaProject, JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER"))); //$NON-NLS-1$)
- JemProjectUtilities.forceClasspathReload(javaProject);
- }
- } catch (SaveFailureException e) {
- Logger.getLogger().logError(e);
- } catch (JavaModelException je) {
- Logger.getLogger().logError(je);
- }
- return OK_STATUS;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModelProvider.java
deleted file mode 100644
index b92188d..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModelProvider.java
+++ /dev/null
@@ -1,338 +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
- *******************************************************************************/
-/*
- * Created on May 13, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IPathVariableManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class J2EEUtilityJarListImportDataModelProvider extends AbstractDataModelProvider implements IJ2EEUtilityJarListImportDataModelProperties {
-
-
-
- private static final Object[] EMPTY_ARRAY = new Object[0];
-
- public J2EEUtilityJarListImportDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames(){
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EAR_PROJECT);
- propertyNames.add(CREATE_PROJECT);
- propertyNames.add(LINK_IMPORT);
- propertyNames.add(CREATE_LINKED_PROJECT);
- propertyNames.add(COPY);
- propertyNames.add(BINARY_IMPORT);
- propertyNames.add(UTILITY_JAR_LIST);
- propertyNames.add(AVAILABLE_JARS_DIRECTORY);
- propertyNames.add(PROJECT_ROOT);
- propertyNames.add(OVERRIDE_PROJECT_ROOT);
- propertyNames.add(OVERWRITE_IF_NECESSARY);
- propertyNames.add(CREATE_LINKED_PATH_VARIABLE);
- propertyNames.add(LINKED_PATH_VARIABLE);
- return propertyNames;
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
-
- boolean notify = super.propertySet(propertyName, propertyValue);
-
- if (AVAILABLE_JARS_DIRECTORY.equals(propertyName)) {
- setProperty(UTILITY_JAR_LIST, EMPTY_ARRAY);
- } else if (UTILITY_JAR_LIST.equals(propertyName)) {
- if (propertyValue == null)
- setProperty(UTILITY_JAR_LIST, EMPTY_ARRAY);
- else
- model.setProperty(UTILITY_JAR_LIST, propertyValue);
-
- } else if (PROJECT_ROOT.equals(propertyName)) {
- if (propertyValue == null || ((String) propertyValue).length() == 0)
- setBooleanProperty(OVERRIDE_PROJECT_ROOT, false);
- else
- setBooleanProperty(OVERRIDE_PROJECT_ROOT, true);
-
- } else if (J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT)) {
-
- setBooleanProperty(LINK_IMPORT, false);
- setBooleanProperty(CREATE_LINKED_PROJECT, false);
- setBooleanProperty(COPY, false);
-
- model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
- } else if (J2EEUtilityJarListImportDataModelProvider.LINK_IMPORT.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.LINK_IMPORT)) {
-
- setBooleanProperty(CREATE_PROJECT, false);
- setBooleanProperty(CREATE_LINKED_PROJECT, false);
- setBooleanProperty(COPY, false);
-
- model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
- } else if (J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT)) {
-
- setBooleanProperty(LINK_IMPORT, false);
- setBooleanProperty(CREATE_PROJECT, false);
- setBooleanProperty(COPY, false);
-
- model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
- } else if (J2EEUtilityJarListImportDataModelProvider.COPY.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.COPY)) {
-
- setBooleanProperty(CREATE_PROJECT, false);
- setBooleanProperty(LINK_IMPORT, false);
- setBooleanProperty(CREATE_LINKED_PROJECT, false);
-
- model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
-
- } else if (J2EEUtilityJarListImportDataModelProvider.OVERRIDE_PROJECT_ROOT.equals(propertyName)) {
- model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
- } else if (J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE.equals(propertyName)) {
-
- if (isLinkedPathVariableInvalid())
- setProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE, "TEAM_SHARED_DIRECTORY"); //$NON-NLS-1$
-
- model.notifyPropertyChange(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(AVAILABLE_JARS_DIRECTORY, IDataModel.ENABLE_CHG);
-
- } else if (J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE.equals(propertyName)) {
- // will only set if necessary
- setProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE, Boolean.TRUE);
-
- if (linkedPathExists()) {
- String linkedPathVariable = getStringProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE);
- IPathVariableManager manager = ResourcesPlugin.getWorkspace().getPathVariableManager();
- IPath availableJarsPath = manager.getValue(linkedPathVariable);
- setProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE, Boolean.valueOf(availableJarsPath != null));
-
- String availableJarsPathString = availableJarsPath.toOSString();
- if (availableJarsPathString != null && availableJarsPathString.length() > 0)
- setProperty(J2EEUtilityJarListImportDataModelProvider.AVAILABLE_JARS_DIRECTORY, availableJarsPathString);
- }
-
- model.notifyPropertyChange(AVAILABLE_JARS_DIRECTORY, IDataModel.ENABLE_CHG);
- }
- return notify;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#basicIsEnabled(java.lang.String)
- */
- public boolean isPropertyEnabled(String propertyName) {
- if (J2EEUtilityJarListImportDataModelProvider.BINARY_IMPORT.equals(propertyName)) {
- return getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT);
- } else if (J2EEUtilityJarListImportDataModelProvider.OVERRIDE_PROJECT_ROOT.equals(propertyName)) {
- return getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT);
- } else if (J2EEUtilityJarListImportDataModelProvider.PROJECT_ROOT.equals(propertyName)) {
- return (getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT)) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.OVERRIDE_PROJECT_ROOT);
- } else if (J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE.equals(propertyName)) {
- return (getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.LINK_IMPORT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT));
- } else if (J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE.equals(propertyName)) {
- return getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE);
- } else if (J2EEUtilityJarListImportDataModelProvider.AVAILABLE_JARS_DIRECTORY.equals(propertyName)) {
- boolean createPath = getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE);
- return !createPath || !linkedPathExists();
- }
- return super.isPropertyEnabled(propertyName);
- }
-
- private boolean linkedPathExists() {
- String linkedPathVariable = getStringProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE);
- if (linkedPathVariable == null || linkedPathVariable.trim().length() == 0)
- return false;
-
- IPathVariableManager manager = ResourcesPlugin.getWorkspace().getPathVariableManager();
- IPath availableJarsPath = manager.getValue(linkedPathVariable);
- return availableJarsPath != null;
- }
-
- private boolean isLinkedPathVariableInvalid() {
- boolean createPath = getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE);
- String linkedPathVariable = getStringProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE);
- return (createPath && (linkedPathVariable == null || linkedPathVariable.trim().length() == 0));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEImportDataModel#getDefaultProperty(java.lang.String)
- */
- public Object getDefaultProperty(String propertyName) {
- if (CREATE_PROJECT.equals(propertyName))
- return Boolean.TRUE;
- else if (LINK_IMPORT.equals(propertyName))
- return Boolean.FALSE;
- else if (COPY.equals(propertyName))
- return Boolean.FALSE;
- else if (CREATE_LINKED_PROJECT.equals(propertyName))
- return Boolean.FALSE;
- else if (CREATE_LINKED_PATH_VARIABLE.equals(propertyName))
- return Boolean.FALSE;
- else if (OVERRIDE_PROJECT_ROOT.equals(propertyName))
- return Boolean.FALSE;
- else if (BINARY_IMPORT.equals(propertyName))
- return Boolean.FALSE;
- else if (PROJECT_ROOT.equals(propertyName))
- return ResourcesPlugin.getWorkspace().getRoot().getRawLocation().toOSString();
- else if (EAR_PROJECT.equals(propertyName))
- return ""; //$NON-NLS-1$
- else if (AVAILABLE_JARS_DIRECTORY.equals(propertyName))
- return ""; //$NON-NLS-1$
- else if (LINKED_PATH_VARIABLE.equals(propertyName))
- return ""; //$NON-NLS-1$
- else if (UTILITY_JAR_LIST.equals(propertyName))
- return EMPTY_ARRAY;
- else
- return super.getDefaultProperty(propertyName);
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (EAR_PROJECT.equals(propertyName)) {
- return DataModelPropertyDescriptor.createDescriptors(getValidProjectNames());
- } else if (LINKED_PATH_VARIABLE.equals(propertyName)) {
- IPathVariableManager manager = ResourcesPlugin.getWorkspace().getPathVariableManager();
- return DataModelPropertyDescriptor.createDescriptors(manager.getPathVariableNames());
- } else
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- /**
- * Populate the resource name combo with connector projects that are not encrypted.
- */
- protected Object[] getValidProjectNames() {
- List projects = Arrays.asList(ResourcesPlugin.getWorkspace().getRoot().getProjects());
- List projectsWithNature = new ArrayList();
-
- for (int i = 0; i < projects.size(); i++) {
- IProject project = (IProject) projects.get(i);
- //TODO filter only on ear projects
- if (project.isOpen()) {
- projectsWithNature.add(project.getFullPath().toString());
- }
- }
-
- return ProjectUtilities.getProjectNamesWithoutForwardSlash((String[]) projectsWithNature.toArray(new String[projectsWithNature.size()]));
- }
-
- public IStatus validate(String propertyName) {
- if (EAR_PROJECT.equals(propertyName) /* && isSet(EAR_PROJECT) */) {
- String earProjectName = getStringProperty(EAR_PROJECT);
- if (earProjectName != null && earProjectName.length() > 0) {
- IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName);
- try {
- if (!earProject.isAccessible())
- return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Valid_Project, null);
- return Status.OK_STATUS;
- } catch (Exception e) {
- return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Valid_Project, e);
- }
- }
- return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Valid_Project, null);
-
- } else if (UTILITY_JAR_LIST.equals(propertyName) || J2EEUtilityJarListImportDataModelProvider.OVERWRITE_IF_NECESSARY.equals(propertyName)) {
-
- Object[] list = (Object[]) getProperty(UTILITY_JAR_LIST);
- if (list == null || list.length == 0)
- return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Select_Jar, null);
-
- /* return validateExistingProjects(); */
-
- return Status.OK_STATUS;
- } else if (LINKED_PATH_VARIABLE.equals(propertyName)) {
- if (isLinkedPathVariableInvalid())
- return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Linked_Path, null);
- } else if (PROJECT_ROOT.equals(propertyName)) {
- return validateProjectRoot();
- }
- return validate(propertyName);
- }
-
- private IStatus validateProjectRoot() {
- if (isPropertySet(PROJECT_ROOT) && getBooleanProperty(OVERRIDE_PROJECT_ROOT)) {
- String loc = (String) getProperty(PROJECT_ROOT);
- File file = new File(loc);
- if (!file.canWrite() || !file.isDirectory())
- return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_0, null);
- }
- return OK_STATUS;
- }
-
- // private IStatus validateExistingProjects() {
- // boolean createProject = (getBooleanProperty(J2EEUtilityJarListImportDataModel.CREATE_PROJECT)
- // || getBooleanProperty(J2EEUtilityJarListImportDataModel.CREATE_LINKED_PROJECT));
- // boolean overwrite =
- // getBooleanProperty(J2EEUtilityJarListImportDataModel.OVERWRITE_IF_NECESSARY);
- // if (createProject && !overwrite) {
- // File jarFile = null;
- // String nameWithoutJar = null;
- // Object[] selectedJars = (Object[]) getProperty(UTILITY_JAR_LIST);
- // for (int i = 0; i < selectedJars.length; i++) {
- // jarFile = (File) selectedJars[i];
- // int start = jarFile.getName().indexOf(".jar");
- // nameWithoutJar = jarFile.getName().substring(0, start);
- // if (ProjectUtilities.getProject(nameWithoutJar).exists())
- // return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, "Existing projects with the derived
- // names already exist (\"{0}\").", null); // {0}
- // // nameWithoutJar
- //
- // }
- // }
- // return Status.OK_STATUS;
- // }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationDataModelProvider.java
deleted file mode 100644
index 33b8978..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationDataModelProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.application.internal.operations;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class RemoveComponentFromEnterpriseApplicationDataModelProvider extends RemoveReferenceComponentsDataModelProvider implements IAddComponentToEnterpriseApplicationDataModelProperties {
-
- public RemoveComponentFromEnterpriseApplicationDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(TARGET_COMPONENTS_TO_URI_MAP);
- return propertyNames;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new RemoveComponentFromEnterpriseApplicationOperation(model);
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
- final Map map = new HashMap();
- final List components = (List) getProperty(TARGET_COMPONENT_LIST);
- for (int i = 0; i < components.size(); i++) {
- final IVirtualComponent component = (IVirtualComponent) components.get(i);
- map.put(component, AddComponentToEnterpriseApplicationDataModelProvider.getComponentURI(component));
- }
- return map;
- }
- return super.getDefaultProperty(propertyName);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
deleted file mode 100644
index 638163e..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.application.internal.operations;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class RemoveComponentFromEnterpriseApplicationOperation extends RemoveReferenceComponentOperation {
-
-
- public RemoveComponentFromEnterpriseApplicationOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- super.execute(monitor, info);
- updateEARDD(monitor);
- return OK_STATUS;
- }
-
- protected void updateEARDD(IProgressMonitor monitor) {
-
- EARArtifactEdit earEdit = null;
- try {
- IVirtualComponent comp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
- if (!comp.getProject().isAccessible()) return;
- earEdit = EARArtifactEdit.getEARArtifactEditForWrite(comp.getProject());
- if (earEdit != null) {
- Application application = earEdit.getApplication();
- List list = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- Map map = (Map) model.getProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP);
- if (list != null && list.size() > 0) {
- for (int i = 0; i < list.size(); i++) {
- IVirtualComponent wc = (IVirtualComponent) list.get(i);
- removeModule(application, wc, (String) map.get(wc));
- }
- }
- }
- earEdit.saveIfNecessary(monitor);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (earEdit != null)
- earEdit.dispose();
- }
- }
-
- protected void removeModule(Application application, IVirtualComponent wc, String name) {
- Application dd = application;
- Module existingModule = dd.getFirstModule(name);
- dd.getModules().remove(existingModule);
-
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProperties.java
deleted file mode 100644
index 36573c5..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProperties.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.application.internal.operations;
-
-public interface UpdateManifestDataModelProperties {
- /**
- * Project name with manifest to update, type String required.
- */
- public static final String PROJECT_NAME = "UpdateManifestDataModel.PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * java.util.List of Strings
- */
- public static final String JAR_LIST = "UpdateManifestDataModel.CLASSPATH_LIST"; //$NON-NLS-1$
-
- /**
- * String. This is build from the JAR_LIST property. Never set this property.
- */
- public static final String JAR_LIST_TEXT_UI = "UpdateManifestDataModel.CLASSPATH_LIST_TEXT_UI"; //$NON-NLS-1$
-
- /**
- * Boolean, true merges, false replaces, default is true
- */
- public static final String MERGE = "UpdateManifestDataModel.MERGE"; //$NON-NLS-1$
-
- /**
- * String, no default.
- */
- public static final String MAIN_CLASS = "UpdateManifestDataModel.MAIN_CLASS"; //$NON-NLS-1$
-
-
- /**
- * String, no default.
- */
- public static final String MANIFEST_FILE = "UpdateManifestDataModel.MANIFEST_FILE"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProvider.java
deleted file mode 100644
index e95e85f..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProvider.java
+++ /dev/null
@@ -1,96 +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
- *******************************************************************************/
-/*
- * Created on Nov 13, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class UpdateManifestDataModelProvider extends AbstractDataModelProvider implements UpdateManifestDataModelProperties {
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(JAR_LIST);
- propertyNames.add(JAR_LIST_TEXT_UI);
- propertyNames.add(MERGE);
- propertyNames.add(MAIN_CLASS);
- propertyNames.add(MANIFEST_FILE);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(MERGE)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(JAR_LIST)) {
- return new ArrayList();
- } else if (propertyName.equals(JAR_LIST_TEXT_UI)) {
- return getClasspathAsString();
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean set = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(JAR_LIST) && isPropertySet(JAR_LIST_TEXT_UI))
- setProperty(JAR_LIST_TEXT_UI, getClasspathAsString());
- return set;
- }
-
- public IProject getProject() {
- String projectName = (String) getProperty(PROJECT_NAME);
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
- public String getClasspathAsString() {
- List classpathList = (List) getProperty(JAR_LIST);
- return convertClasspathListToString(classpathList);
- }
-
- public static String convertClasspathListToString(List list) {
- String classpathString = ""; //$NON-NLS-1$
- for (int i = 0; i < list.size(); i++) {
- classpathString += ((String) list.get(i)) + " "; //$NON-NLS-1$
- }
- return classpathString.trim();
- }
-
- public static List convertClasspathStringToList(String string) {
- List list = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer(string, " "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- list.add(tokenizer.nextToken());
- }
- return list;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new UpdateManifestOperation(model);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java
deleted file mode 100644
index 7c1ff04..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java
+++ /dev/null
@@ -1,79 +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
- *******************************************************************************/
-/*
- * Created on Nov 13, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class UpdateManifestOperation extends AbstractDataModelOperation {
-
- public UpdateManifestOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) throws ExecutionException {
- IFile file = (IFile)model.getProperty(UpdateManifestDataModelProperties.MANIFEST_FILE);
-
- String classPathValue = model.getStringProperty(UpdateManifestDataModelProperties.JAR_LIST_TEXT_UI);
- try {
- ArchiveManifest mf = J2EEProjectUtilities.readManifest(file);
-
- if (mf == null)
- mf = new ArchiveManifestImpl();
- mf.addVersionIfNecessary();
- if (model.getBooleanProperty(UpdateManifestDataModelProperties.MERGE)) {
- mf.mergeClassPath(ArchiveUtil.getTokens(classPathValue));
- } else {
- mf.setClassPath(classPathValue);
- }
- if (model.isPropertySet(UpdateManifestDataModelProperties.MAIN_CLASS)) {
- mf.setMainClass(model.getStringProperty(UpdateManifestDataModelProperties.MAIN_CLASS));
- }
-
- J2EEProjectUtilities.writeManifest(file, mf);
- } catch (java.io.IOException ex) {
- throw new ExecutionException(ex.getMessage(),ex);
- }
- return OK_STATUS;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateModuleContextRootInEAROp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateModuleContextRootInEAROp.java
deleted file mode 100644
index 0cee9c9..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateModuleContextRootInEAROp.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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:
- * rfrost@bea.com - initial API and impl
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.List;
-
-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.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <code>AbstractDataModelOperation</code> subclass that updates the context-root for a given
- * module within the application.xml files of all containing EARs.
- */
-public class UpdateModuleContextRootInEAROp extends AbstractDataModelOperation implements IUpdateModuleContextRootProperties {
-
- public UpdateModuleContextRootInEAROp() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- if(monitor != null) {
- monitor.beginTask("", 1);
- }
-
- try {
- final String newContextRoot = model.getStringProperty(CONTEXT_ROOT);
- final IProject project = (IProject) model.getProperty(PROJECT);
- final IDataModel nestedModel = model.getNestedModel(NESTED_MODEL_ID);
- if (nestedModel != null) {
- List earsToUpdate= (List) nestedModel.getProperty(EARS_TO_UPDATE);
- if (newContextRoot != null && earsToUpdate != null && project != null) {
- // update each specified EAR
- for (int i = 0; i < earsToUpdate.size(); i++) {
- updateEARContextRoot((IProject) earsToUpdate.get(i), project, newContextRoot, monitor);
- }
- }
- }
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- return OK_STATUS;
- }
-
- /*
- * Updates the context-root element int the application.xml of the specified EAR for the specified
- * module project to the new value.
- */
- private void updateEARContextRoot(final IProject ear, final IProject project, final String newContextRoot,
- final IProgressMonitor monitor) {
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForWrite(ear);
- if (earEdit != null) {
- final Application application = earEdit.getApplication();
- final IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp == null) {
- return;
- }
- final String moduleURI = AddComponentToEnterpriseApplicationDataModelProvider.getComponentURI(comp);
- final Module module = application.getFirstModule(moduleURI);
- if (module != null && module instanceof WebModule) {
- ((WebModule) module).setContextRoot(newContextRoot);
- }
- earEdit.saveIfNecessary(monitor);
- }
- } finally {
- if (earEdit != null) {
- earEdit.dispose();
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // no-op
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // no-op
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
deleted file mode 100644
index bf1ec2e..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
+++ /dev/null
@@ -1,609 +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.jst.j2ee.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * <p>
- * EARArtifactEdit obtains an {@see org.eclipse.jst.j2ee.application.Application} metamodel.
- * The {@see org.eclipse.jst.j2ee.application.ApplicationResource} which stores the metamodel
- * is retrieved from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using a
- * cached constant (@see
- * org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants#APPLICATION_DD_URI). The
- * defined methods extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-
-public class EARArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory{
-
- public static final Class ADAPTER_TYPE = EARArtifactEdit.class;
-
- /**
- *
- */
- public EARArtifactEdit() {
- super();
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public EARArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- //This should be revereted to protected when 115924 is fixed
- public EARArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.ENTERPRISE_APPLICATION);
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static EARArtifactEdit getEARArtifactEditForRead(IProject aProject) {
- EARArtifactEdit artifactEdit = null;
- try {
- if (isValidEARModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new EARArtifactEdit(aProject, true, false);
- } catch (Exception iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static EARArtifactEdit getEARArtifactEditForWrite(IProject aProject) {
- EARArtifactEdit artifactEdit = null;
- try {
- if (isValidEARModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new EARArtifactEdit(aProject, false, false);
- } catch (Exception iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of EARArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an EARArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of EARArtifactEdit that may only be used to read the underlying content
- * model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static EARArtifactEdit getEARArtifactEditForRead(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getEARArtifactEditForRead(aModule.getProject());
- }
-
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an EARArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of EARArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static EARArtifactEdit getEARArtifactEditForWrite(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- return getEARArtifactEditForWrite(aModule.getProject());
- }
-
- /**
- * @param module
- * A {@see WorkbenchComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is
- * a JST module
- */
- public static boolean isValidEARModule(IVirtualComponent aModule) throws UnresolveableURIException {
- if (!isValidEditableModule(aModule))
- return false;
- return J2EEProjectUtilities.isEARProject(aModule.getProject());
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public EARArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from the given
- * {@see ModuleCoreNature}
- */
-
-
- protected EARArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from ApplicationResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- *
- */
- public int getJ2EEVersion() {
- return getApplicationXmiResource().getJ2EEVersionID();
- }
-
- /**
- *
- * @return ApplicationResource from (@link getDeploymentDescriptorResource())
- *
- */
-
- public ApplicationResource getApplicationXmiResource() {
- return (ApplicationResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Obtains the Application {@see Application}root object from the {@see ApplicationResource},
- * the root object contains all other resource defined objects.
- * </p>
- *
- * @return Application
- *
- */
-
- public Application getApplication() {
- return (Application) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Retrieves the resource from the {@see ArtifactEditModel}
- * </p>
- *
- * @return Resource
- *
- */
-
- public Resource getDeploymentDescriptorResource() {
- return getArtifactEditModel().getResource(J2EEConstants.APPLICATION_DD_URI_OBJ);
- }
-
-
- /**
- * <p>
- * Creates a deployment descriptor root object (Application) and populates with data. Adds the
- * root object to the deployment descriptor resource.
- * </p>
- *
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource}
- * @param version
- * Version to be set on resource....if null default is taken
- *
- * Note: This method is typically used for JUNIT - move?
- * </p>
- */
- protected void addApplicationIfNecessary(XMLResource aResource) {
- if (aResource != null) {
- if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
- Application newApp = ApplicationFactory.eINSTANCE.createApplication();
- aResource.getContents().add(newApp);
- }
- Application application = (Application) aResource.getContents().get(0);
- URI moduleURI = getArtifactEditModel().getModuleURI();
- try {
- application.setDisplayName(StructureEdit.getDeployedName(moduleURI));
- } catch (UnresolveableURIException e) {
- //Ignore
- }
- aResource.setID(application, J2EEConstants.APPL_ID);
- // TODO add more mandatory elements
- }
- }
-
- /**
- * Checks if the uri mapping already exists.
- *
- * @param String
- * currentURI - The current uri of the module.
- * @return boolean
- */
- public boolean uriExists(String currentURI) {
- if (currentURI != null) {
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- if (comp == null)
- return false;
- IVirtualReference[] refComponents = comp.getReferences();
- if (refComponents.length == 0)
- return false;
- for (int i = 0; i < refComponents.length; i++) {
- if (refComponents[i].getRuntimePath().equals(currentURI))
- return true;
- }
- } // if
- return false;
- } // uriExists
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(java.lang.Integer)
- */
- public EObject createModelRoot(int version) {
- ApplicationResource res = (ApplicationResource) getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addApplicationIfNecessary(res);
- return ((ApplicationResource) getDeploymentDescriptorResource()).getRootObject();
- }
-
- /**
- * This method will return the list of IVirtualReferences for all of the utility modules
- * contained in the EAR application
- *
- * @return - an array of IVirtualReferences for utility modules in the EAR
- */
- public IVirtualReference[] getUtilityModuleReferences() {
- List utilityModuleTypes = new ArrayList();
- utilityModuleTypes.add(J2EEProjectUtilities.UTILITY);
- return getComponentReferences(utilityModuleTypes);
- }
-
- public String getModuleURI(IVirtualComponent moduleComp) {
-
- StructureEdit core = null;
- try {
- core = StructureEdit.getStructureEditForRead(getProject());
- WorkbenchComponent component = core.getComponent();
- List referencedComponents = component.getReferencedComponents();
-
- for (int i=0; i<referencedComponents.size(); i++) {
- ReferencedComponent ref = (ReferencedComponent) referencedComponents.get(i);
- if( !moduleComp.isBinary()) {
- if (ref.getHandle().equals(ModuleURIUtil.fullyQualifyURI(moduleComp.getProject()))) {
- if (ref.getDependentObject()!=null)
- return ((Module)ref.getDependentObject()).getUri();
- //If dependent object is not set, assume compname is module name + proper extension
- if (J2EEProjectUtilities.isDynamicWebProject(moduleComp.getProject()) || J2EEProjectUtilities.isStaticWebProject(moduleComp.getProject()))
- return moduleComp.getName()+IJ2EEModuleConstants.WAR_EXT;
- if (J2EEProjectUtilities.isJCAProject(moduleComp.getProject()))
- return moduleComp.getName()+IJ2EEModuleConstants.RAR_EXT;
- return moduleComp.getName()+IJ2EEModuleConstants.JAR_EXT;
- }
-
- }
- else if (moduleComp.isBinary()) {
- if (ref.getHandle().equals(ModuleURIUtil.archiveComponentfullyQualifyURI(moduleComp.getName())))
- return ((Module)ref.getDependentObject()).getUri();
- }
- }
- } finally {
- if (core != null)
- core.dispose();
- }
- return null;
- }
-
- public IVirtualComponent getModuleByManifestURI(final String uri){
- StructureEdit core = null;
- try {
- core = StructureEdit.getStructureEditForRead(getProject());
- WorkbenchComponent component = core.getComponent();
- List referencedComponents = component.getReferencedComponents();
-
- for (int i=0; i<referencedComponents.size(); i++) {
- ReferencedComponent ref = (ReferencedComponent) referencedComponents.get(i);
- if(ref.getDependentObject() != null){
- Module module = (Module)ref.getDependentObject();
- if(uri.equals(module.getUri())){
- String componentName;
- try {
- componentName = ModuleURIUtil.getArchiveName(ref.getHandle());
- return getModule(componentName);
- } catch (UnresolveableURIException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
- } finally {
- if (core != null)
- core.dispose();
- }
- return null;
- }
-
- /**
- * This method will return the an IVirtualComponent for the given module name. The method take either moduleName or
- * moduleName + ".module_extension" (module_extension = ".jar" || ".war" || ".rar") which allows users to get a IVirtualComponent
- * for a given entry in an application.xml
- *
- * @return - a IVirtualComponent for module name
- */
- public IVirtualComponent getModule (String moduleName) {
- if(moduleName == null)
- return null;
- if(moduleName.endsWith(IJ2EEModuleConstants.JAR_EXT) || moduleName.endsWith(IJ2EEModuleConstants.WAR_EXT) || moduleName.endsWith(IJ2EEModuleConstants.RAR_EXT))
- moduleName = moduleName.substring(0, (moduleName.length()- IJ2EEModuleConstants.JAR_EXT.length()));
- IVirtualReference[] references = getComponentReferences();
- for(int i = 0; i < references.length; i++) {
- IVirtualComponent component = references[i].getReferencedComponent();
- if(component.getName().equals(moduleName)) {
- return component;
- }
- }
- return null;
- }
-
- /**
- * This method will return the list of IVirtualReferences for the J2EE module components
- * contained in this EAR application.
- *
- * @return - an array of IVirtualReferences for J2EE modules in the EAR
- */
- public IVirtualReference[] getJ2EEModuleReferences() {
- List j2eeTypes = new ArrayList();
- j2eeTypes.add(J2EEProjectUtilities.APPLICATION_CLIENT);
- j2eeTypes.add(J2EEProjectUtilities.JCA);
- j2eeTypes.add(J2EEProjectUtilities.EJB);
- j2eeTypes.add(J2EEProjectUtilities.DYNAMIC_WEB);
- return getComponentReferences(j2eeTypes);
- }
-
- /**
- * This method will return the list of IVirtualReferences for all of the components
- * contained in this EAR application.
- *
- * @return - an array of IVirtualReferences for components in the EAR
- */
- public IVirtualReference[] getComponentReferences() {
- return getComponentReferences(Collections.EMPTY_LIST);
- }
- /**
- * This method will return the IVirtualReference to the component of the given name
- *
- * @return - IVirtualReference or null if not found
- */
- public IVirtualReference getComponentReference(String componentName) {
- IVirtualReference[] refs = getComponentReferences(Collections.EMPTY_LIST);
- for (int i = 0; i < refs.length; i++) {
- IVirtualReference reference = refs[i];
- if (reference.getReferencedComponent().getName().equals(componentName))
- return reference;
-
- }
- return null;
- }
-
- private IVirtualReference[] getComponentReferences(List componentTypes) {
- List components = new ArrayList();
- IVirtualComponent earComponent = getComponent();
- if (earComponent != null && J2EEProjectUtilities.isEARProject(earComponent.getProject())) {
- IVirtualReference[] refComponents = earComponent.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualComponent module = refComponents[i].getReferencedComponent();
- if (module == null || module.getProject() == null || !module.getProject().isAccessible())
- continue;
- //if component types passed in is null then return all components
- if (componentTypes == null || componentTypes.size()==0)
- components.add(refComponents[i]);
- else {
- if (componentTypes.contains(J2EEProjectUtilities.getJ2EEProjectType(module.getProject()))) {
- components.add(refComponents[i]);
- }
- }
- }
- }
- return (IVirtualReference[]) components.toArray(new IVirtualReference[components.size()]);
- }
-
- public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
-
- return getEARArtifactEditForRead(aComponent);
- }
-
- public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
-
- return getEARArtifactEditForWrite(aComponent);
- }
-
- public Archive asArchive(boolean includeSource) throws OpenFailureException {
- EARComponentLoadStrategyImpl loader = new EARComponentLoadStrategyImpl(getComponent());
- loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- return CommonarchiveFactory.eINSTANCE.openEARFile(loader, uri);
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- EARArtifactEdit earEdit = new EARArtifactEdit(project,false,true);
- try {
- earEdit.createModelRoot(version);
- earEdit.save(null);
- } finally {
- earEdit.dispose();
- }
- }
-
- /**
- * This method will return the context root in this application for the passed in web project.
- *
- * @param webProject
- * @return contextRoot String
- */
- public String getWebContextRoot(IProject webProject) {
- if (webProject == null || !J2EEProjectUtilities.isDynamicWebProject(webProject))
- return null;
- IVirtualComponent webComp = ComponentCore.createComponent(webProject);
- String webModuleURI = getModuleURI(webComp);
- if (webModuleURI != null) {
- WebModule webModule = (WebModule) getApplication().getModule(webModuleURI,null);
- if (webModule != null)
- return webModule.getContextRoot();
- }
- return null;
- }
-
- /**
- * This method will set the context root on the application for the passed in contextRoot. This
- * must be called in a write artifact edit and be saved for changes to be saved.
- *
- * @param webProject
- * @param aContextRoot
- */
- public void setWebContextRoot(IProject webProject, String aContextRoot) {
- if (webProject == null || !J2EEProjectUtilities.isDynamicWebProject(webProject))
- return;
- IVirtualComponent webComp = ComponentCore.createComponent(webProject);
- String webModuleURI = getModuleURI(webComp);
- if (webModuleURI != null) {
- WebModule webModule = (WebModule) getApplication().getModule(webModuleURI,null);
- if (webModule != null)
- webModule.setContextRoot(aContextRoot);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/package.xml
deleted file mode 100644
index aec496d..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>EJBArtifactEdit api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the EARArtifactEdit api. This api is used to work with the emf model
- of a flexible EAR module. It contains api to read and serialize out the emf model for enterprise applications.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java
deleted file mode 100644
index 90836a7..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,420 +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.jst.j2ee.internal.earcreation;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.DefaultJ2EEComponentCreationOperation;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-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.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class DefaultJ2EEComponentCreationDataModelProvider extends AbstractDataModelProvider implements IDefaultJ2EEComponentCreationDataModelProperties {
- private static String CREATE_BASE = "DefaultJ2EEComponentCreationDataModel.CREATE_"; //$NON-NLS-1$
-
- private static final int EJB = 0;
- private static final int WEB = 1;
- private static final int RAR = 2;
- private static final int CLIENT = 3;
-
- private static final String WEB_SUFFIX = "Web"; //$NON-NLS-1$
- private static final String EJB_SUFFIX = "EJB"; //$NON-NLS-1$
- private static final String CLIENT_SUFFIX = "Client"; //$NON-NLS-1$
- private static final String CONNECTOR_SUFFIX = "Connector"; //$NON-NLS-1$
-
- private IDataModel ejbModel;
- private IDataModel ejbFacetModel;
- private IDataModel webModel;
- private IDataModel webFacetModel;
- private IDataModel jcaModel;
- private IDataModel jcaFacetModel;
- private IDataModel clientModel;
- private IDataModel clientFacetModel;
-
- public DefaultJ2EEComponentCreationDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(EAR_COMPONENT_NAME);
- propertyNames.add(APPCLIENT_COMPONENT_NAME);
- propertyNames.add(WEB_COMPONENT_NAME);
- propertyNames.add(EJB_COMPONENT_NAME);
- propertyNames.add(CONNECTOR_COMPONENT_NAME);
- propertyNames.add(J2EE_VERSION);
- propertyNames.add(CREATE_EJB);
- propertyNames.add(CREATE_WEB);
- propertyNames.add(CREATE_APPCLIENT);
- propertyNames.add(CREATE_CONNECTOR);
- propertyNames.add(MODULE_NAME_COLLISIONS_VALIDATION);
- propertyNames.add(ENABLED);
- propertyNames.add(NESTED_MODEL_CLIENT);
- propertyNames.add(NESTED_MODEL_EJB);
- propertyNames.add(NESTED_MODEL_JCA);
- propertyNames.add(NESTED_MODEL_WEB);
- propertyNames.add(FACET_RUNTIME);
- return propertyNames;
- }
-
-
- public IDataModelOperation getDefaultOperation() {
- return new DefaultJ2EEComponentCreationOperation(model);
- }
-
- public void init() {
- initNestedCreationModels();
- super.init();
- }
-
- protected void initNestedCreationModels() {
- clientModel = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- model.addNestedModel(NESTED_MODEL_CLIENT, clientModel);
- clientFacetModel = ((FacetDataModelMap)clientModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT);
- clientFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
-
- EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
- if (ejbExt != null) {
- ejbModel = ejbExt.createProjectDataModel();
- if (ejbModel != null){
- model.addNestedModel(NESTED_MODEL_EJB, ejbModel);
- ejbFacetModel = ((FacetDataModelMap)ejbModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.EJB);
- ejbFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
- }
- }
- WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
- if (webExt != null) {
- webModel = webExt.createProjectDataModel();
- if (webModel != null){
- model.addNestedModel(NESTED_MODEL_WEB, webModel);
- webFacetModel = ((FacetDataModelMap)webModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
- webFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
- }
- }
- JcaModuleExtension rarExt = EarModuleManager.getJCAModuleExtension();
- if (rarExt != null) {
- jcaModel = rarExt.createProjectDataModel();
- if (jcaModel != null){
- model.addNestedModel(NESTED_MODEL_JCA, jcaModel);
- jcaFacetModel = ((FacetDataModelMap)jcaModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.JCA);
- jcaFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
- }
- }
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.startsWith(CREATE_BASE))
- return getDefaultCreateValue(propertyName);
- if (propertyName.equals(ENABLED))
- return Boolean.TRUE;
- return super.getDefaultProperty(propertyName);
- }
-
-
- private Object getDefaultCreateValue(String propertyName) {
- if (propertyName.equals(CREATE_CONNECTOR)) {
- int version = getIntProperty(J2EE_VERSION);
- if (version < J2EEVersionConstants.J2EE_1_3_ID)
- return Boolean.FALSE;
- }
- return Boolean.TRUE;
- }
-
- private int convertPropertyNameToInt(String propertyName) {
- if (propertyName.equals(CREATE_WEB)) {
- return WEB;
- } else if (propertyName.equals(CREATE_EJB)) {
- return EJB;
- } else if (propertyName.equals(CREATE_CONNECTOR)) {
- return RAR;
- } else if (propertyName.equals(CREATE_APPCLIENT)) {
- return CLIENT;
- }
- return -1;
- }
-
- private String ensureUniqueProjectName(String projectName) {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String newName = projectName;
- int index = 0;
- IProject proj = root.getProject(newName);
- while (proj.exists()) {
- index++;
- newName = projectName + index;
- proj = root.getProject(newName);
- }
- return newName;
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean notify = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(J2EE_VERSION)) {
- updatedJ2EEVersion((Integer) propertyValue);
- return true;
- }else if (propertyName.startsWith(CREATE_BASE)){
- notifyEnablement(convertPropertyNameToInt(propertyName));
- }else if (propertyName.equals(EAR_COMPONENT_NAME)) {
- setDefaultComponentNames((String) propertyValue);
- }else if(webModel != null && propertyName.equals(WEB_COMPONENT_NAME)){
- webModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
- }else if(clientModel != null && propertyName.equals(APPCLIENT_COMPONENT_NAME)){
- clientModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
- }else if(ejbModel != null && propertyName.equals(EJB_COMPONENT_NAME)){
- ejbModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
- }else if(jcaModel != null && propertyName.equals(CONNECTOR_COMPONENT_NAME)){
- jcaModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
- }
- else if(FACET_RUNTIME.equals(propertyName)){
- if(webModel != null){
- webModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
- }
- if(clientModel != null){
- clientModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
- }
- if(ejbModel != null){
- ejbModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
- }
- if(jcaModel != null){
- jcaModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
- }
- }
- return notify;
- }
-
- private void notifyEnablement(int flag) {
- String propertyName = null;
- switch (flag) {
- case EJB :
- propertyName = EJB_COMPONENT_NAME;
- break;
- case WEB :
- propertyName = WEB_COMPONENT_NAME;
- break;
- case CLIENT :
- propertyName = APPCLIENT_COMPONENT_NAME;
- break;
- case RAR :
- propertyName = CONNECTOR_COMPONENT_NAME;
- }
- if (propertyName != null)
- model.notifyPropertyChange(propertyName, IDataModel.ENABLE_CHG);
- }
-
- private void updatedJ2EEVersion(Integer version) {
- setNestedJ2EEVersion(version);
- if (version.intValue() < J2EEVersionConstants.J2EE_1_3_ID && model.isPropertySet(CREATE_CONNECTOR)) {
- model.setProperty(CREATE_CONNECTOR, Boolean.FALSE);
- }
- }
-
- public IStatus validateModuleNameCollisions() {
- if (getBooleanProperty(ENABLED)) {
- ArrayList list = new ArrayList();
- String projectName = null;
- String actualProjectName = null;
- boolean errorCollision = false;
- boolean errorNoSelection = true;
- if (getBooleanProperty(CREATE_APPCLIENT)) {
- actualProjectName = clientModel.getStringProperty(IJ2EEComponentCreationDataModelProperties.PROJECT_NAME);
- projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
- list.add(projectName);
- errorNoSelection = false;
- }
- if (getBooleanProperty(CREATE_EJB)) {
- actualProjectName = ejbModel.getStringProperty(IJ2EEComponentCreationDataModelProperties.PROJECT_NAME);
- projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
- if (!list.contains(projectName)) {
- list.add(projectName);
- } else {
- errorCollision = true;
- }
- errorNoSelection = false;
- }
- if (!errorCollision && getBooleanProperty(CREATE_WEB)) {
- actualProjectName = webModel.getStringProperty(IJ2EEComponentCreationDataModelProperties.PROJECT_NAME);
- projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
- if (!list.contains(projectName)) {
- list.add(projectName);
- } else {
- errorCollision = true;
- }
- errorNoSelection = false;
- }
- if (!errorCollision && getBooleanProperty(CREATE_CONNECTOR)) {
- actualProjectName = jcaModel.getStringProperty(IJ2EEComponentCreationDataModelProperties.PROJECT_NAME);
- projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
- if (!list.contains(projectName)) {
- list.add(projectName);
- } else {
- errorCollision = true;
- }
- errorNoSelection = false;
- }
- if (errorCollision) {
- return J2EEPlugin.newErrorStatus(EARCreationResourceHandler.getString("DuplicateModuleNames", new Object[]{actualProjectName}), null); //$NON-NLS-1$
- } else if (errorNoSelection) {
- return J2EEPlugin.newErrorStatus(EARCreationResourceHandler.NoModulesSelected, null);
- }
- }
-
- return OK_STATUS;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- public IStatus validate(String propertyName) {
- if (propertyName.equals(APPCLIENT_COMPONENT_NAME)) {
- return validateComponentName(getStringProperty(APPCLIENT_COMPONENT_NAME));
- }
- if (propertyName.equals(WEB_COMPONENT_NAME)) {
- return validateComponentName(getStringProperty(WEB_COMPONENT_NAME));
- }
- if (propertyName.equals(EJB_COMPONENT_NAME)) {
- return validateComponentName(getStringProperty(EJB_COMPONENT_NAME));
- }
- if (propertyName.equals(CONNECTOR_COMPONENT_NAME)) {
- return validateComponentName(getStringProperty(CONNECTOR_COMPONENT_NAME));
- }
- return super.validate(propertyName);
- }
-
- private IStatus validateComponentName(String componentName) {
- IStatus status = OK_STATUS;
- if (status.isOK()) {
- if (componentName.indexOf("#") != -1) { //$NON-NLS-1$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- } else if (componentName == null || componentName.equals("")) { //$NON-NLS-1$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- }
- return status;
- }
-
- private void setDefaultNestedComponentName(String name, int flag) {
- IDataModel modModule = getNestedModel(flag);
- if (modModule != null) {
- String compName = ensureUniqueProjectName(name);
- modModule.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, compName);
- }
- }
-
- private void setDefaultComponentNames(String base) {
- String componentName;
- if (base.endsWith(EJB_SUFFIX))
- componentName = base;
- else
- componentName = base + EJB_SUFFIX;
- setDefaultNestedComponentName(componentName, EJB);
- setProperty(EJB_COMPONENT_NAME, componentName);
- if (base.endsWith(WEB_SUFFIX))
- componentName = base;
- else
- componentName = base + WEB_SUFFIX;
- setDefaultNestedComponentName(componentName, WEB);
- setProperty(WEB_COMPONENT_NAME, componentName);
- if (base.endsWith(CLIENT_SUFFIX))
- componentName = base;
- else
- componentName = base + CLIENT_SUFFIX;
- setDefaultNestedComponentName(componentName, CLIENT);
- setProperty(APPCLIENT_COMPONENT_NAME, componentName);
- if (base.endsWith(CONNECTOR_SUFFIX))
- componentName = base;
- else
- componentName = base + CONNECTOR_SUFFIX;
- setDefaultNestedComponentName(componentName, RAR);
- setProperty(CONNECTOR_COMPONENT_NAME, componentName);
- }
-
- private void setNestedJ2EEVersion(Object j2eeVersion) {
- int j2eeVer = ((Integer) j2eeVersion).intValue();
- if (ejbFacetModel != null) {
- String facetVersionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertJ2EEVersionIDToEJBVersionID(j2eeVer));
- IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(ejbFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
- ejbFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
- }
- if (webFacetModel != null) {
- String facetVersionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertJ2EEVersionIDToWebVersionID(j2eeVer));
- IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(webFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
- webFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
- }
- if (jcaFacetModel != null) {
- String facetVersionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertJ2EEVersionIDToConnectorVersionID(j2eeVer));
- IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(jcaFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
- jcaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
- }
- if (clientFacetModel != null){
- String facetVersionString = J2EEVersionUtil.convertVersionIntToString(j2eeVer);
- IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(clientFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
- clientFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
- }
- }
-
- private IDataModel getNestedModel(int flag) {
- switch (flag) {
- case EJB :
- return ejbModel;
- case WEB :
- return webModel;
- case RAR :
- return jcaModel;
- case CLIENT :
- return clientModel;
- }
- return null;
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (propertyName.equals(CREATE_CONNECTOR) || propertyName.equals(CONNECTOR_COMPONENT_NAME)) {
- int version = getIntProperty(J2EE_VERSION);
- boolean result = version > J2EEVersionConstants.J2EE_1_2_ID;
- return result;
- }
- if (propertyName.equals(APPCLIENT_COMPONENT_NAME))
- return getBooleanProperty(CREATE_APPCLIENT);
- if (propertyName.equals(EJB_COMPONENT_NAME))
- return getBooleanProperty(CREATE_EJB);
- if (propertyName.equals(WEB_COMPONENT_NAME))
- return getBooleanProperty(CREATE_WEB);
- return super.isPropertyEnabled(propertyName);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARCreationResourceHandler.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARCreationResourceHandler.java
deleted file mode 100644
index 1909982..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARCreationResourceHandler.java
+++ /dev/null
@@ -1,105 +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.jst.j2ee.internal.earcreation;
-
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class EARCreationResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "earcreation";//$NON-NLS-1$
-
- private EARCreationResourceHandler() {
- // Do not instantiate
- }
-
- public static String Error_occured_getting_appl_ERROR_;
- public static String Error_occured_getting_appl1_ERROR_;
- public static String Creating__UI_;
- public static String Creating_EAR_Project_UI_;
- public static String The_project_already_exist_ERROR_;
- public static String EARProjectCreationOperatio_ERROR_;
- public static String ABS_PATH_CHANGED_UI_;
- public static String UNSAVED_CHANGES_WARN_;
- public static String PROJECT_MAP_PROBLEMS_ERROR_;
- public static String MODULE_PROJECTS_CLOSED_WARN_;
- public static String Add_Module_Command_Label_UI_;
- public static String Remove_Module_Command_Label_UI_;
-
- public static String Set_project_UI_;
- public static String Add_Utility_JAR_UI;
- public static String REM_UTIL_JAR_UI;
- public static String PROJ_DESC_UPDATE_ERROR_UI_;
- public static String Not_an_ear_project_UI_;
- public static String EAR_PROJECT_MUST_BE_OPEN_UI_;
- public static String Updating_absolute_paths_UI_;
- public static String DuplicateModuleNames;
- public static String NoModulesSelected;
-
- public static String KEY_1;
- public static String KEY_2;
- public static String KEY_3;
- public static String KEY_4;
- public static String KEY_5;
- public static String KEY_6;
- public static String KEY_7;
- public static String KEY_8;
- public static String KEY_9;
- public static String KEY_10;
- public static String KEY_11;
- public static String KEY_12;
- public static String KEY_13;
- public static String KEY_14;
- public static String KEY_15;
- public static String KEY_16;
- public static String J2EEUtilityJarListImportOperation_UI_0;
- public static String J2EEUtilityJarListImportOperation_UI_1;
- public static String J2EEUtilityJarListImportOperation_UI_2;
- public static String J2EEUtilityJarListImportDataModel_0;
- public static String J2EEUtilityJarListImportDataModel_Specify_Valid_Project;
- public static String J2EEUtilityJarListImportDataModel_Select_Jar;
- public static String J2EEUtilityJarListImportDataModel_Specify_Linked_Path;
- public static String EARImportDataModel_UI_0;
- public static String EARImportDataModel_UI_1;
- public static String EARImportDataModel_UI_2;
- public static String EARImportDataModel_UI_3;
- public static String ModuleMappingImpl_UI_0;
- public static String UtilityJARMappingImpl_UI_0;
- public static String importWrongType;
- public static String importWrongVersion;
- public static String EAR_PROJECTNAME_SAMEAS_MODULE;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EARCreationResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-
- public static final String ADD_MODULE_MODULE_TYPE = KEY_1;
- public static final String ADD_MODULE_MODULE_EXISTS = KEY_2;
- public static final String ADD_MODULE_MODULE_CLOSED = KEY_3;
- public static final String ADD_MODULE_MODULE_NULL = KEY_4;
- public static final String ADD_PROJECT_URI_EXISTS = KEY_5;
- public static final String ADD_PROJECT_NOT_JAVA = KEY_6;
- public static final String ADD_PROJECT_UTIL_URI = KEY_7;
- public static final String ADD_PROJECT_UTIL_MAPPED = KEY_8;
- public static final String ADD_PROJECT_NOT_EAR = KEY_9;
- public static final String ADD_PROJECT_URI_EMPTY = KEY_10;
- public static final String NOT_AN_APP_CLIENT = KEY_11;
- public static final String NOT_AN_EAR = KEY_12;
- public static final String NOT_AN_EJB = KEY_13;
- public static final String NOT_A_RAR = KEY_14;
- public static final String NOT_A_WAR = KEY_15;
- public static final String SERVER_TARGET_NOT_SUPPORT_EAR = KEY_16;
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationDataModelProvider.java
deleted file mode 100644
index 2b9fe87..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.earcreation;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * @deprecated
- * @see EARFacetProjectCreationDataModelProvider
- */
-
-public class EarComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IEarComponentCreationDataModelProperties {
-
- public IDataModelOperation getDefaultOperation() {
- //return new EARComponentCreationOperation(model);
- return new EarComponentCreationFacetOperation(model);
- }
-
- /**
- * @return Returns the default J2EE spec level based on the Global J2EE
- * Preference
- */
- protected Integer getDefaultComponentVersion() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- switch (highestJ2EEPref) {
- case (J2EEVersionConstants.J2EE_1_4_ID):
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID);
- case (J2EEVersionConstants.J2EE_1_3_ID):
- return new Integer(J2EEVersionConstants.J2EE_1_3_ID);
- case (J2EEVersionConstants.J2EE_1_2_ID):
- return new Integer(J2EEVersionConstants.J2EE_1_2_ID);
- default:
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID);
- }
- }
-
- public Set getPropertyNames(){
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(J2EE_PROJECTS_LIST);
- propertyNames.add(JAVA_PROJECT_LIST);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(DD_FOLDER)) {
- return IPath.SEPARATOR + "META_INF"; //$NON-NLS-1$
- } else if (propertyName.equals(UI_SHOW_EAR_SECTION)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(J2EE_PROJECTS_LIST)) {
- return Collections.EMPTY_LIST;
- }else if (propertyName.equals(JAVA_PROJECT_LIST)){
- return Collections.EMPTY_LIST;
- } else if(propertyName.equals(NESTED_EAR_COMPONENT_CREATION_DM)){
- return model;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
- if (propertyName.equals(COMPONENT_VERSION)) {
- Integer propertyValue = (Integer) getProperty(propertyName);
- String description = null;
- switch (propertyValue.intValue()) {
- case J2EEVersionConstants.VERSION_1_2:
- description = J2EEVersionConstants.VERSION_1_2_TEXT;
- break;
- case J2EEVersionConstants.VERSION_1_3:
- description = J2EEVersionConstants.VERSION_1_3_TEXT;
- break;
- case J2EEVersionConstants.VERSION_1_4:
- default:
- description = J2EEVersionConstants.VERSION_1_4_TEXT;
- break;
- }
- return new DataModelPropertyDescriptor(propertyValue, description);
- }
- return super.getPropertyDescriptor(propertyName);
- }
-
- public DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- DataModelPropertyDescriptor[] descriptors = null;
- switch (highestJ2EEPref) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- descriptors = new DataModelPropertyDescriptor[1];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_3_ID:
- descriptors = new DataModelPropertyDescriptor[2];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_4_ID:
- default:
- descriptors = new DataModelPropertyDescriptor[3];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
- descriptors[2] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_4_ID), J2EEVersionConstants.VERSION_1_4_TEXT);
- break;
- }
- return descriptors;
- }
-
- protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
- return moduleVersion;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEModuleCreationDataModel#getModuleType()
- */
- protected EClass getComponentType() {
- return CommonarchiveFactoryImpl.getPackage().getEARFile();
- }
-
- protected String getComponentExtension() {
- return ".ear"; //$NON-NLS-1$
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(PROJECT_NAME)) {
- // validate server target
- IStatus stat = super.validate(propertyName);
- if( stat.isOK()){
- String projectName = getDataModel().getStringProperty(PROJECT_NAME);
- if (projectName != null && projectName.length() != 0) {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project != null) {
- IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (runtime != null) {
- IRuntimeType type = runtime.getRuntimeType();
- String typeId = type.getId();
- if (typeId.startsWith("org.eclipse.jst.server.tomcat")) { //$NON-NLS-1$
- String msg = EARCreationResourceHandler.SERVER_TARGET_NOT_SUPPORT_EAR;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- }
- }
- }
- }else if(propertyName.equals(J2EE_PROJECTS_LIST)){
- return validateTargetComponentVersion((List)model.getProperty(J2EE_PROJECTS_LIST));
- }
- return super.validate(propertyName);
- }
-
- private IStatus validateTargetComponentVersion(List list) {
-
- Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
- int earVersion = version.intValue();
- for (Iterator iter = list.iterator(); iter.hasNext();) {
- IProject handle = (IProject)iter.next();
- //IVirtualComponent comp = (IVirtualComponent) iter.next();
- IVirtualComponent comp = ComponentCore.createComponent(handle.getProject());
- int compVersion = J2EEVersionUtil.convertVersionStringToInt(comp);
- if (earVersion < compVersion) {
- String errorStatus = "The Module specification level of "+handle.getName()+", is incompatible with the containing EAR version"; //$NON-NLS-1$
- return J2EEPlugin.newErrorStatus(errorStatus, null);
- }
-
- }
- return OK_STATUS;
- }
-
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean returnValue = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(COMPONENT_NAME)) {
- setProperty(COMPONENT_DEPLOY_NAME, getDataModel().getStringProperty(COMPONENT_NAME));
- } else if(propertyName.equals(NESTED_EAR_COMPONENT_CREATION_DM)){
- throw new RuntimeException();
- }
- return returnValue;
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName){
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- protected boolean isCreatingEarComponent() {
- return true;
- }
-
- protected IProject getEARProject(){
- String earProjname = (String) model.getProperty(COMPONENT_NAME);
-
- IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
- earDM.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, earProjname);
-
- if( earProjname != null && !earProjname.equals("") && validate(COMPONENT_NAME).isOK())
- return ProjectUtilities.getProject(earProjname);
- else
- return null;
-
- }
-
- protected String getJ2EEProjectType() {
- return J2EEProjectUtilities.ENTERPRISE_APPLICATION;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationFacetOperation.java
deleted file mode 100644
index 25ec9ca..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,129 +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.jst.j2ee.internal.earcreation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * @deprecated
- * @see EARFacetProjectCreationDataModelProvider
- */
-public class EarComponentCreationFacetOperation extends AbstractDataModelOperation implements IFacetProjectCreationDataModelProperties {
-
- public EarComponentCreationFacetOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- String runtime = model.getStringProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID);
- IRuntime facetRuntime = null;
- try {
- if(null != ServerCore.findRuntime(runtime)){
- runtime = ServerCore.findRuntime(runtime).getName();
- facetRuntime = RuntimeManager.getRuntime(runtime);
- }
- } catch (Exception e) {
- // proceed with facetRuntime = null
- }
- dm.setProperty(FACET_RUNTIME, facetRuntime);
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- dm.setProperty(FACET_PROJECT_NAME, projectName);
-
- IDataModel newDM = setupEarInstallAction();
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(FACET_DM_MAP);
- map.add(newDM);
-
- IStatus stat = dm.getDefaultOperation().execute(monitor, info);
- if (stat.isOK())
- addModulesToEAR(monitor);
-
- return stat;
- }
-
- protected IDataModel setupEarInstallAction() {
- String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
- IDataModel earFacetInstallDataModel = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
- return earFacetInstallDataModel;
- }
-
- protected void setRuntime(IFacetedProject facetProj) throws CoreException {
- String runtimeID = model.getStringProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID);
- try {
- String runtimeName = ServerCore.findRuntime(runtimeID).getName();
- IRuntime runtime = RuntimeManager.getRuntime(runtimeName);
- facetProj.setRuntime(runtime, null);
- } catch (IllegalArgumentException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- private IStatus addModulesToEAR(IProgressMonitor monitor) {
- IStatus stat = OK_STATUS;
- try {
- IDataModel dm = (IDataModel) model.getProperty(IJ2EEComponentCreationDataModelProperties.NESTED_ADD_COMPONENT_TO_EAR_DM);
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- IProject project = ProjectUtilities.getProject(projectName);
- IVirtualComponent component = ComponentCore.createComponent(project);
-
-
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, component);
-
- List moduleProjectsList = (List) model.getProperty(IEarComponentCreationDataModelProperties.J2EE_PROJECTS_LIST);
- if (moduleProjectsList != null && !moduleProjectsList.isEmpty()) {
- List moduleComponentsList = new ArrayList(moduleProjectsList.size());
- for (int i = 0; i < moduleProjectsList.size(); i++) {
- moduleComponentsList.add(ComponentCore.createComponent((IProject) moduleProjectsList.get(i)));
- }
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, moduleComponentsList);
- stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- if (stat != OK_STATUS)
- return stat;
- dm.getDefaultOperation().execute(monitor, null);
- }
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- return stat;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
deleted file mode 100644
index 4b7a635..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.earcreation;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class EarFacetInstallDataModelProvider extends J2EEFacetInstallDataModelProvider implements IEarFacetInstallDataModelProperties {
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CONTENT_DIR);
- names.add(J2EE_PROJECTS_LIST);
- names.add(JAVA_PROJECT_LIST);
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(FACET_ID)) {
- return J2EEProjectUtilities.ENTERPRISE_APPLICATION;
- } else if (propertyName.equals(CONTENT_DIR)) {
- return "EarContent";
- } else if (propertyName.equals(J2EE_PROJECTS_LIST) || propertyName.equals(JAVA_PROJECT_LIST)) {
- return Collections.EMPTY_LIST;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IStatus validate(String name) {
- if (name.equals(J2EE_PROJECTS_LIST)) {
- return validateTargetComponentVersion((List) model.getProperty(J2EE_PROJECTS_LIST));
- }
- return super.validate(name);
- }
-
- private IStatus validateTargetComponentVersion(List list) {
- int earVersion = getJ2EEVersion();
- for (Iterator iter = list.iterator(); iter.hasNext();) {
- IProject handle = (IProject) iter.next();
- IVirtualComponent comp = ComponentCore.createComponent(handle.getProject());
- if (comp == null) return OK_STATUS; //Not a faceted project, so version not relevant
- int compVersion = J2EEVersionUtil.convertVersionStringToInt(comp);
- if (earVersion < compVersion) {
- String errorStatus = "The Module specification level of " + handle.getName() + ", is incompatible with the containing EAR version"; //$NON-NLS-1$
- return J2EEPlugin.newErrorStatus(errorStatus, null);
- }
- }
- return OK_STATUS;
- }
-
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return J2EEVersionUtil.convertVersionStringToInt(version.getVersionString());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IDefaultJ2EEComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IDefaultJ2EEComponentCreationDataModelProperties.java
deleted file mode 100644
index 5fc021a..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IDefaultJ2EEComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,75 +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.jst.j2ee.internal.earcreation;
-
-public interface IDefaultJ2EEComponentCreationDataModelProperties {
- /**
- * Required - This is the name of the project. type String
- */
- public static final String PROJECT_NAME = "DefaultJ2EEComponentCreationDataModel.PROJECT_NAME"; //$NON-NLS-1$
- /**
- * Required - This is the name of the ear. type String
- */
- public static final String EAR_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.EAR_NAME"; //$NON-NLS-1$
- /**
- * Required - This is the name of the app client. type String
- */
- public static final String APPCLIENT_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.APPCLIENT_NAME"; //$NON-NLS-1$
- /**
- * Required - This is the name of the WEB. type String
- */
- public static final String WEB_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.WEB_COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * Required - This is the name of the EJB. type String
- */
- public static final String EJB_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.EJB_COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * Required - This is the name of the connector. type String
- */
- public static final String CONNECTOR_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.CONNECTOR_COMPONENT_NAME"; //$NON-NLS-1$
-
- public static final String J2EE_VERSION = "DefaultJ2EEComponentCreationDataModel.J2EE_VERSION"; //$NON-NLS-1$
- /**
- * Default is true. type Boolean
- */
- public static final String CREATE_EJB = "DefaultJ2EEComponentCreationDataModel.CREATE_EJB";
- /**
- * Default is true. type Boolean
- */
- public static final String CREATE_WEB = "DefaultJ2EEComponentCreationDataModel.CREATE_WEB";
- /**
- * Default is true. type Boolean
- */
- public static final String CREATE_APPCLIENT = "DefaultJ2EEComponentCreationDataModel.CREATE_CLIENT";
- /**
- * Default is true. type Boolean
- */
- public static final String CREATE_CONNECTOR = "DefaultJ2EEComponentCreationDataModel.CREATE_CONNECTOR";
-
- /**
- * Used for validation only; validates no collsions between various module names. Do not set
- * this value.
- */
- public static final String MODULE_NAME_COLLISIONS_VALIDATION = "DefaultJ2EEComponentCreationDataModel.MODULE_NAME_COLLISIONS_VALIDATION"; //$NON-NLS-1$
-
- /**
- * Default is true. type Boolean
- */
- public static final String ENABLED = "DefaultJ2EEComponentCreationDataModel.ENABLED"; //$NON-NLS-1$
-
- public static final String NESTED_MODEL_EJB = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_EJB"; //$NON-NLS-1$
- public static final String NESTED_MODEL_WEB = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_WEB"; //$NON-NLS-1$
- public static final String NESTED_MODEL_JCA = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_JCA"; //$NON-NLS-1$
- public static final String NESTED_MODEL_CLIENT = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_CLIENT"; //$NON-NLS-1$
-
- public static final String FACET_RUNTIME = "DefaultJ2EEComponentCreationDataModel.FACET_RUNTIME";//$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEarFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEarFacetInstallDataModelProperties.java
deleted file mode 100644
index 9ffe4bd..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEarFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.earcreation;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-
-
-public interface IEarFacetInstallDataModelProperties extends IJ2EEFacetInstallDataModelProperties {
-
- //TODO what is this???
- public static final String CONTENT_DIR = "IEarFacetInstallDataModelProperties.CONTENT_DIR";//$NON-NLS-1$
-
- public static final String J2EE_PROJECTS_LIST = "IEarFacetInstallDataModelProperties.J2EE_PROJECTS_LIST"; //$NON-NLS-1$
- public static final String JAVA_PROJECT_LIST = "IEarFacetInstallDataModelProperties.JAVA_PROJECT_LIST"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java
deleted file mode 100644
index fd059de..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java
+++ /dev/null
@@ -1,29 +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.jst.j2ee.internal.earcreation;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfigRegister;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-public interface ILooseConfigConstants {
- /**
- * The short name of the loose configuration file; will most often need to use
- * {@link #CONFIG_PATH}
- */
- String CONFIG_FILE_NAME = "looseconfig.xmi"; //$NON-NLS-1$
- /** The absolute path to the loose configuration file */
- String CONFIG_PATH = J2EEPlugin.getDefault().getStateLocation().append(CONFIG_FILE_NAME).toOSString();
- /** The property name used by WebSphere to lookup the loose configuration location to load */
- String WAS_PROPERTY = LooseConfigRegister.LOOSE_CONFIG_PROPERTY;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMap.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMap.java
deleted file mode 100644
index 49d57de..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMap.java
+++ /dev/null
@@ -1,40 +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.jst.j2ee.internal.earcreation.modulemap;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * @lastgen interface EARProjectMap extends EObject {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface EARProjectMap extends EObject {
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of Mappings references
- */
- EList getMappings();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of UtilityJARMappings references
- */
- EList getUtilityJARMappings();
-
-} //EARProjectMap
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMapImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMapImpl.java
deleted file mode 100644
index ed53a87..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMapImpl.java
+++ /dev/null
@@ -1,171 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-
-
-/**
- * @lastgen class EARProjectMapImpl extends EObjectImpl implements EARProjectMap, EObject {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class EARProjectMapImpl extends EObjectImpl implements EARProjectMap {
- /**
- * @generated This field/method will be replaced during code generation.
- */
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected EList mappings = null;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected EList utilityJARMappings = null;
-
-
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected EARProjectMapImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return ModulemapPackage.eINSTANCE.getEARProjectMap();
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public EList getMappings() {
- if (mappings == null) {
- mappings = new EObjectContainmentEList(ModuleMapping.class, this, ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS);
- }
- return mappings;
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public EList getUtilityJARMappings() {
- if (utilityJARMappings == null) {
- utilityJARMappings = new EObjectContainmentEList(UtilityJARMapping.class, this, ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS);
- }
- return utilityJARMappings;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
- case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
- return ((InternalEList) getMappings()).basicRemove(otherEnd, msgs);
- case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
- return ((InternalEList) getUtilityJARMappings()).basicRemove(otherEnd, msgs);
- default :
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
- return getMappings();
- case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
- return getUtilityJARMappings();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
- getMappings().clear();
- getMappings().addAll((Collection) newValue);
- return;
- case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
- getUtilityJARMappings().clear();
- getUtilityJARMappings().addAll((Collection) newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
- getMappings().clear();
- return;
- case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
- getUtilityJARMappings().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
- return mappings != null && !mappings.isEmpty();
- case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
- return utilityJARMappings != null && !utilityJARMappings.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
-} //EARProjectMapImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMapping.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMapping.java
deleted file mode 100644
index cee99ee..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMapping.java
+++ /dev/null
@@ -1,55 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.Module;
-
-
-
-/**
- * @lastgen interface ModuleMapping extends EObject {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- * </p>
- */
-public interface ModuleMapping extends EObject {
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the ProjectName attribute
- */
- String getProjectName();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param value
- * The new value of the ProjectName attribute
- */
- void setProjectName(String value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The Module reference
- */
- Module getModule();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param l
- * The new value of the Module reference
- */
- void setModule(Module value);
-
-} //ModuleMapping
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMappingImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMappingImpl.java
deleted file mode 100644
index 333f8d9..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMappingImpl.java
+++ /dev/null
@@ -1,194 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-
-
-/**
- * @lastgen class ModuleMappingImpl extends EObjectImpl implements ModuleMapping, EObject {}
- * * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModuleMappingImpl extends EObjectImpl implements ModuleMapping {
- /**
- * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getProjectName()
- * @generated
- * @ordered
- */
- protected static final String PROJECT_NAME_EDEFAULT = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected String projectName = PROJECT_NAME_EDEFAULT;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected Module module = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected ModuleMappingImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return ModulemapPackage.eINSTANCE.getModuleMapping();
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public String getProjectName() {
- return projectName;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setProjectName(String newProjectName) {
- String oldProjectName = projectName;
- projectName = newProjectName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.MODULE_MAPPING__PROJECT_NAME, oldProjectName, projectName));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public Module getModule() {
- if (module != null && module.eIsProxy()) {
- Module oldModule = module;
- module = (Module) EcoreUtil.resolve(module, this);
- if (module != oldModule) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModulemapPackage.MODULE_MAPPING__MODULE, oldModule, module));
- }
- }
- return module;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Module basicGetModule() {
- return module;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setModule(Module newModule) {
- Module oldModule = module;
- module = newModule;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.MODULE_MAPPING__MODULE, oldModule, module));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
- return getProjectName();
- case ModulemapPackage.MODULE_MAPPING__MODULE :
- if (resolve)
- return getModule();
- return basicGetModule();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
- return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
- case ModulemapPackage.MODULE_MAPPING__MODULE :
- return module != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
- setProjectName((String) newValue);
- return;
- case ModulemapPackage.MODULE_MAPPING__MODULE :
- setModule((Module) newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
- setProjectName(PROJECT_NAME_EDEFAULT);
- return;
- case ModulemapPackage.MODULE_MAPPING__MODULE :
- setModule((Module) null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(EARCreationResourceHandler.getString("ModuleMappingImpl_UI_0", new Object[]{projectName})); //$NON-NLS-1$
- return result.toString();
- }
-
-} //ModuleMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapAdapterFactory.java
deleted file mode 100644
index ae34dbb..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapAdapterFactory.java
+++ /dev/null
@@ -1,130 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-
-
-
-/**
- * @lastgen class ModulemapAdapterFactory extends AdapterFactoryImpl {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapAdapterFactory extends AdapterFactoryImpl {
- /**
- * @generated This field/method will be replaced during code generation.
- */
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected static ModulemapPackage modelPackage;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public ModulemapAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = ModulemapPackage.eINSTANCE;
- }
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected ModulemapSwitch modelSwitch = new ModulemapSwitch() {
- public Object caseModuleMapping(ModuleMapping object) {
- return createModuleMappingAdapter();
- }
-
- public Object caseEARProjectMap(EARProjectMap object) {
- return createEARProjectMapAdapter();
- }
-
- public Object caseUtilityJARMapping(UtilityJARMapping object) {
- return createUtilityJARMappingAdapter();
- }
-
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter) modelSwitch.doSwitch((EObject) target);
- }
-
-
- /**
- * By default create methods return null so that we can easily ignore cases. It's useful to
- * ignore a case when inheritance will catch all the cases anyway.
- */
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Adapter createEARProjectMapAdapter() {
- return null;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Adapter createModuleMappingAdapter() {
- return null;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Adapter createUtilityJARMappingAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case. <!-- begin-user-doc --> This default
- * implementation returns null. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //ModulemapAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactory.java
deleted file mode 100644
index 33a1f77..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactory.java
+++ /dev/null
@@ -1,56 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EFactory;
-
-
-/**
- * @lastgen interface ModulemapFactory extends EFactory {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface ModulemapFactory extends EFactory {
- /**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- ModulemapFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactoryImpl();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return EARProjectMap value
- */
- EARProjectMap createEARProjectMap();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return ModuleMapping value
- */
- ModuleMapping createModuleMapping();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return UtilityJARMapping value
- */
- UtilityJARMapping createUtilityJARMapping();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- ModulemapPackage getModulemapPackage();
-
-} //ModulemapFactory
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactoryImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactoryImpl.java
deleted file mode 100644
index 1f132f3..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactoryImpl.java
+++ /dev/null
@@ -1,92 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-
-
-/**
- * @lastgen class ModulemapFactoryImpl extends EFactoryImpl implements ModulemapFactory, EFactory {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapFactoryImpl extends EFactoryImpl implements ModulemapFactory {
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public ModulemapFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case ModulemapPackage.MODULE_MAPPING :
- return createModuleMapping();
- case ModulemapPackage.EAR_PROJECT_MAP :
- return createEARProjectMap();
- case ModulemapPackage.UTILITY_JAR_MAPPING :
- return createUtilityJARMapping();
- }
- return null;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EARProjectMap createEARProjectMap() {
- EARProjectMapImpl earProjectMap = new EARProjectMapImpl();
- return earProjectMap;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public ModuleMapping createModuleMapping() {
- ModuleMappingImpl moduleMapping = new ModuleMappingImpl();
- return moduleMapping;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public UtilityJARMapping createUtilityJARMapping() {
- UtilityJARMappingImpl utilityJARMapping = new UtilityJARMappingImpl();
- return utilityJARMapping;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public ModulemapPackage getModulemapPackage() {
- return (ModulemapPackage) getEPackage();
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public static ModulemapPackage getPackage() {
- return ModulemapPackage.eINSTANCE;
- }
-
-} //ModulemapFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapInit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapInit.java
deleted file mode 100644
index a833ba4..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapInit.java
+++ /dev/null
@@ -1,53 +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.jst.j2ee.internal.earcreation.modulemap;
-
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-//import com.ibm.etools.j2ee.internal.project.EAREditModel;
-/**
-* @deprecated
-* Use
-* <p>
-* Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
-* as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
-* all the info that was captured in .modulemaps file will is now captured in the .component file
-*/
-
-public class ModulemapInit {
- protected static boolean initialized = false;
-
- public static void init() {
- init(true);
- }
-
- public static void init(boolean shouldPreRegisterPackages) {
- if (!initialized) {
- initialized = true;
- invokePrereqInits(shouldPreRegisterPackages);
- if (shouldPreRegisterPackages) {
- ExtendedEcoreUtil.preRegisterPackage("modulemap.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
- public EPackage getEPackage() {
- return ModulemapPackage.eINSTANCE;
- }
- });
- }
- //ResourceDependencyRegister.registerDependency(J2EEConstants.APPLICATION_DD_URI_OBJ, EAREditModel.MODULE_MAP_URI_OBJ);
- }
- }
-
- public static void invokePrereqInits(boolean shouldPreRegisterPackages) {
- //TODO Should remove....
- //com.ibm.ejs.models.base.extensions.init.ExtensionsInit.init(shouldPreRegisterPackages);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackage.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackage.java
deleted file mode 100644
index 638f73a..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackage.java
+++ /dev/null
@@ -1,181 +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.jst.j2ee.internal.earcreation.modulemap;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-
-/**
- * @lastgen interface ModulemapPackage extends EPackage {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface ModulemapPackage extends EPackage {
- /**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "modulemap"; //$NON-NLS-1$
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
-
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int EAR_PROJECT_MAP = 1;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int MODULE_MAPPING = 0;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int MODULE_MAPPING__PROJECT_NAME = 0;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int MODULE_MAPPING__MODULE = 1;
-
- /**
- * The number of structural features of the the '<em>Module Mapping</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int MODULE_MAPPING_FEATURE_COUNT = 2;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int EAR_PROJECT_MAP__MAPPINGS = 0;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS = 1;
-
- /**
- * The number of structural features of the the '<em>EAR Project Map</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int EAR_PROJECT_MAP_FEATURE_COUNT = 2;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int UTILITY_JAR_MAPPING = 2;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int UTILITY_JAR_MAPPING__PROJECT_NAME = 0;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int UTILITY_JAR_MAPPING__URI = 1;
-
-
- /**
- * The number of structural features of the the '<em>Utility JAR Mapping</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int UTILITY_JAR_MAPPING_FEATURE_COUNT = 2;
-
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- String eNS_URI = "modulemap.xmi"; //$NON-NLS-1$
- /**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "modulemap"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- ModulemapPackage eINSTANCE = org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackageImpl.init();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return EARProjectMap object
- */
- EClass getEARProjectMap();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getEARProjectMap_Mappings();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getEARProjectMap_UtilityJARMappings();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return ModuleMapping object
- */
- EClass getModuleMapping();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getModuleMapping_ProjectName();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getModuleMapping_Module();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return UtilityJARMapping object
- */
- EClass getUtilityJARMapping();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getUtilityJARMapping_ProjectName();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getUtilityJARMapping_Uri();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- ModulemapFactory getModulemapFactory();
-
-} //ModulemapPackage
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java
deleted file mode 100644
index a0184ec..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java
+++ /dev/null
@@ -1,238 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-
-
-
-/**
- * @lastgen class ModulemapPackageImpl extends EPackageImpl implements ModulemapPackage, EPackage {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapPackageImpl extends EPackageImpl implements ModulemapPackage {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass moduleMappingEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass earProjectMapEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass utilityJARMappingEClass = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- private ModulemapPackageImpl() {
- super(eNS_URI, ModulemapFactory.eINSTANCE);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public static ModulemapPackage init() {
- // Initialize simple dependencies
- CommonPackageImpl.init();
- JavaRefPackageImpl.init();
- ApplicationPackageImpl.init();
- EcorePackageImpl.init();
-
- // Obtain or create and register package and interdependencies
- ModulemapPackageImpl theModulemapPackage = (ModulemapPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ModulemapPackageImpl());
-
- // Step 1: create meta-model objects
- theModulemapPackage.createPackageContents();
-
- // Step 2: complete initialization
- theModulemapPackage.initializePackageContents();
-
- return theModulemapPackage;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getEARProjectMap() {
- return earProjectMapEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getEARProjectMap_Mappings() {
- return (EReference) earProjectMapEClass.getEReferences().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getEARProjectMap_UtilityJARMappings() {
- return (EReference) earProjectMapEClass.getEReferences().get(1);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getModuleMapping() {
- return moduleMappingEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getModuleMapping_ProjectName() {
- return (EAttribute) moduleMappingEClass.getEAttributes().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getModuleMapping_Module() {
- return (EReference) moduleMappingEClass.getEReferences().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getUtilityJARMapping() {
- return utilityJARMappingEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getUtilityJARMapping_ProjectName() {
- return (EAttribute) utilityJARMappingEClass.getEAttributes().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getUtilityJARMapping_Uri() {
- return (EAttribute) utilityJARMappingEClass.getEAttributes().get(1);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public ModulemapFactory getModulemapFactory() {
- return (ModulemapFactory) getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is guarded to have no affect on
- * any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void createPackageContents() {
- if (isCreated)
- return;
- isCreated = true;
-
- // Create classes and their features
- moduleMappingEClass = createEClass(MODULE_MAPPING);
- createEAttribute(moduleMappingEClass, MODULE_MAPPING__PROJECT_NAME);
- createEReference(moduleMappingEClass, MODULE_MAPPING__MODULE);
-
- earProjectMapEClass = createEClass(EAR_PROJECT_MAP);
- createEReference(earProjectMapEClass, EAR_PROJECT_MAP__MAPPINGS);
- createEReference(earProjectMapEClass, EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS);
-
- utilityJARMappingEClass = createEClass(UTILITY_JAR_MAPPING);
- createEAttribute(utilityJARMappingEClass, UTILITY_JAR_MAPPING__PROJECT_NAME);
- createEAttribute(utilityJARMappingEClass, UTILITY_JAR_MAPPING__URI);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This method is guarded to have
- * no affect on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized)
- return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- // CommonPackageImpl theCommonPackage =
- // (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
- // JavaRefPackageImpl theJavaRefPackage =
- // (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
- // EcorePackageImpl theEcorePackage =
- // (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(moduleMappingEClass, ModuleMapping.class, "ModuleMapping", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
- initEAttribute(getModuleMapping_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, true, false); //$NON-NLS-1$
- initEReference(getModuleMapping_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, true, false); //$NON-NLS-1$
-
- initEClass(earProjectMapEClass, EARProjectMap.class, "EARProjectMap", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
- initEReference(getEARProjectMap_Mappings(), this.getModuleMapping(), null, "mappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, true, false); //$NON-NLS-1$
- initEReference(getEARProjectMap_UtilityJARMappings(), this.getUtilityJARMapping(), null, "utilityJARMappings", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, true, false); //$NON-NLS-1$
-
- initEClass(utilityJARMappingEClass, UtilityJARMapping.class, "UtilityJARMapping", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
- initEAttribute(getUtilityJARMapping_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, true, false); //$NON-NLS-1$
- initEAttribute(getUtilityJARMapping_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, true, false); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
- }
-} //ModulemapPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapSwitch.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapSwitch.java
deleted file mode 100644
index ff5df4d..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapSwitch.java
+++ /dev/null
@@ -1,107 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-
-
-/**
- * @lastgen class ModulemapSwitch {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapSwitch {
- /**
- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected static ModulemapPackage modelPackage;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public ModulemapSwitch() {
- if (modelPackage == null) {
- modelPackage = ModulemapPackage.eINSTANCE;
- }
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Object doSwitch(EObject theEObject) {
- EClass theEClass = theEObject.eClass();
- if (theEClass.eContainer() == modelPackage) {
- switch (theEClass.getClassifierID()) {
- case ModulemapPackage.MODULE_MAPPING : {
- ModuleMapping moduleMapping = (ModuleMapping) theEObject;
- Object result = caseModuleMapping(moduleMapping);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case ModulemapPackage.EAR_PROJECT_MAP : {
- EARProjectMap earProjectMap = (EARProjectMap) theEObject;
- Object result = caseEARProjectMap(earProjectMap);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case ModulemapPackage.UTILITY_JAR_MAPPING : {
- UtilityJARMapping utilityJARMapping = (UtilityJARMapping) theEObject;
- Object result = caseUtilityJARMapping(utilityJARMapping);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- default :
- return defaultCase(theEObject);
- }
- }
- return defaultCase(theEObject);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Object caseEARProjectMap(EARProjectMap object) {
- return null;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Object caseModuleMapping(ModuleMapping object) {
- return null;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Object caseUtilityJARMapping(UtilityJARMapping object) {
- return null;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //ModulemapSwitch
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMapping.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMapping.java
deleted file mode 100644
index e523561..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMapping.java
+++ /dev/null
@@ -1,53 +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.jst.j2ee.internal.earcreation.modulemap;
-
-
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * @lastgen interface UtilityJARMapping extends EObject {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface UtilityJARMapping extends EObject {
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the ProjectName attribute
- */
- String getProjectName();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param value
- * The new value of the ProjectName attribute
- */
- void setProjectName(String value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the Uri attribute
- */
- String getUri();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param value
- * The new value of the Uri attribute
- */
- void setUri(String value);
-
-} //UtilityJARMapping
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMappingImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMappingImpl.java
deleted file mode 100644
index d935451..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMappingImpl.java
+++ /dev/null
@@ -1,183 +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.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-
-
-/**
- * @lastgen class UtilityJARMappingImpl extends EObjectImpl implements UtilityJARMapping, EObject {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class UtilityJARMappingImpl extends EObjectImpl implements UtilityJARMapping {
- /**
- * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getProjectName()
- * @generated
- * @ordered
- */
- protected static final String PROJECT_NAME_EDEFAULT = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected String projectName = PROJECT_NAME_EDEFAULT;
- /**
- * The default value of the '{@link #getUri() <em>Uri</em>}' attribute. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @see #getUri()
- * @generated
- * @ordered
- */
- protected static final String URI_EDEFAULT = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected String uri = URI_EDEFAULT;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected UtilityJARMappingImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return ModulemapPackage.eINSTANCE.getUtilityJARMapping();
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public String getProjectName() {
- return projectName;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setProjectName(String newProjectName) {
- String oldProjectName = projectName;
- projectName = newProjectName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME, oldProjectName, projectName));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setUri(String newUri) {
- String oldUri = uri;
- uri = newUri;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.UTILITY_JAR_MAPPING__URI, oldUri, uri));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
- return getProjectName();
- case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
- return getUri();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
- return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
- case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
- return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
- setProjectName((String) newValue);
- return;
- case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
- setUri((String) newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
- case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
- setProjectName(PROJECT_NAME_EDEFAULT);
- return;
- case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
- setUri(URI_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(EARCreationResourceHandler.getString("UtilityJARMappingImpl_UI_0", new Object[]{projectName, uri})); //$NON-NLS-1$
- return result.toString();
- }
-
-} //UtilityJARMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java
deleted file mode 100644
index 889db80..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java
+++ /dev/null
@@ -1,54 +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.jst.j2ee.internal.modulecore.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-
-/**
- * <p>
- * Adapts {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}s to
- * {@see org.eclipse.jst.j2ee.internal.modulecore.util.EARArtifactEdit} facades.
- * </p>
- */
-public class EarEditAdapterFactory implements IAdapterFactory {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
-
- if (adapterType == EARArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
- ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
- if (J2EEProjectUtilities.isEARProject(editModel.getProject()))
- return new EARArtifactEdit((ArtifactEditModel) adaptableObject);
- }
- return null;
-
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
-
- return new Class[]{ArtifactEdit.class, EARArtifactEdit.class};
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java
deleted file mode 100644
index 71c0def..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java
+++ /dev/null
@@ -1,45 +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
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.ImportOption;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface EarModuleExtension {
-
- /**
- * Return a default instance of the J2EEModuleCreationDataModel.
- *
- * @return
- */
- IDataModel createProjectDataModel();
-
- IDataModel createImportDataModel();
-
- IDataModelOperation createProjectCreationOperation(IDataModel dataModel);
-
- IDataModelOperation createProjectCreationOperation(ImportOption option);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java
deleted file mode 100644
index d67120d..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java
+++ /dev/null
@@ -1,48 +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
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.ImportOption;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public abstract class EarModuleExtensionImpl implements EarModuleExtension {
- /**
- *
- */
- public EarModuleExtensionImpl() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectCreationOperation(com.ibm.etools.archive.ear.operations.ImportOption)
- */
- public IDataModelOperation createProjectCreationOperation(ImportOption option) {
- if (option.getArchiveType() == ImportOption.MODULE)
- return option.getModel().getDefaultOperation();
- return null;
- }
-
- public IDataModelOperation createProjectCreationOperation(IDataModel dataModel) {
- return dataModel.getDefaultOperation();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java
deleted file mode 100644
index 3a9ed14..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java
+++ /dev/null
@@ -1,72 +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
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EarModuleExtensionRegistry extends RegistryReader {
-
- static final String EXTENSION_NAME = "EARModuleExtension"; //$NON-NLS-1$
- static final String ELEMENT_EARMODULE_EXTENSION = "earModuleExtension"; //$NON-NLS-1$
- static final String MODULE_EXTENSION_CLASS = "extensionClass"; //$NON-NLS-1$
- private static EarModuleExtensionRegistry INSTANCE = null;
-
- public EarModuleExtensionRegistry() {
- super(J2EEPlugin.PLUGIN_ID, EXTENSION_NAME);
- }
-
- public static EarModuleExtensionRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new EarModuleExtensionRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * readElement() - parse and deal w/ an extension like: <earModuleExtension extensionClass =
- * "com.ibm.etools.web.plugin.WebModuleExtensionImpl"/>
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(ELEMENT_EARMODULE_EXTENSION))
- return false;
-
- EarModuleExtension extension = null;
- try {
- extension = (EarModuleExtension) element.createExecutableExtension(MODULE_EXTENSION_CLASS);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- if (extension != null)
- addModuleExtension(extension);
- return true;
- }
-
-
- private static void addModuleExtension(EarModuleExtension ext) {
- EarModuleManager.registerModuleExtension(ext);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleManager.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleManager.java
deleted file mode 100644
index 14d2cfb..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleManager.java
+++ /dev/null
@@ -1,94 +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
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import java.util.HashMap;
-
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EarModuleManager {
- static HashMap moduleExtensions = new HashMap();
-
-
- /**
- * @return
- */
- public static HashMap getModuleExtensions() {
- return moduleExtensions;
- }
-
- public static EarModuleExtension getModuleExtension(String key) {
- //Make sure the registry is loaded
- EarModuleExtensionRegistry.getInstance();
- return (EarModuleExtension) moduleExtensions.get(key);
- }
-
- /**
- * @return
- */
- public static EjbModuleExtension getEJBModuleExtension() {
- return (EjbModuleExtension) getModuleExtension(J2EEProjectUtilities.EJB);
- }
-
- /**
- * @return
- */
- public static JcaModuleExtension getJCAModuleExtension() {
- return (JcaModuleExtension) getModuleExtension(J2EEProjectUtilities.JCA);
- }
-
- /**
- * @return
- */
- public static WebModuleExtension getWebModuleExtension() {
- return (WebModuleExtension) getModuleExtension(J2EEProjectUtilities.DYNAMIC_WEB);
- }
-
- public static boolean hasEJBModuleExtension() {
- return (EjbModuleExtension) getModuleExtension(J2EEProjectUtilities.EJB) != null;
- }
-
- public static boolean hasJCAModuleExtension() {
- return (JcaModuleExtension) getModuleExtension(J2EEProjectUtilities.JCA) != null;
- }
-
- public static boolean hasWebModuleExtension() {
- return getModuleExtension(J2EEProjectUtilities.DYNAMIC_WEB) != null;
- }
-
- public static void registerModuleExtension(EarModuleExtension ext) {
- if (ext instanceof WebModuleExtension)
- moduleExtensions.put(J2EEProjectUtilities.DYNAMIC_WEB, ext);
- else if (ext instanceof EjbModuleExtension)
- moduleExtensions.put(J2EEProjectUtilities.EJB, ext);
- else if (ext instanceof JcaModuleExtension)
- moduleExtensions.put(J2EEProjectUtilities.JCA, ext);
- else
- moduleExtensions.put(J2EEProjectUtilities.ENTERPRISE_APPLICATION, ext);
- }
-
- public static void removeModuleExtension(String key) {
- moduleExtensions.remove(key);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java
deleted file mode 100644
index 53c7462..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.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
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface EjbModuleExtension extends EarModuleExtension {
-
- //void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand cmd);
-
- //J2EEJavaProjectInfo createProjectInfo();
-
- //J2EEImportOperationOLD createImportOperation(IProject proj, EJBJarFile ejbJarFile);
-
- EJBJar getEJBJar(IProject aProject);
-
- IProject getDefinedEJBClientJARProject(IProject anEJBProject);
-
- IDataModelOperation createEJBClientJARProject(
- final String clientProjectName,
- final String srcFolderName,
- final String ejbProjectName,
- final String earProjectName,
- final org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime);
-
- IDataModelOperation createEJBClientJARProject(IProject ejbProject);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/JcaModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/JcaModuleExtension.java
deleted file mode 100644
index 92ca9ca..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/JcaModuleExtension.java
+++ /dev/null
@@ -1,36 +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
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-//import org.eclipse.jst.j2ee.internal.earcreation.UpdateModuleReferencesInEARProjectCommand;
-//import org.eclipse.jst.j2ee.internal.project.J2EENature;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface JcaModuleExtension extends EarModuleExtension {
-
- //void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand cmd);
-
- //J2EEJavaProjectInfo createProjectInfo();
-
- //J2EEImportOperation createImportOperation(IProject proj, RARFile rarFile);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/WebModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/WebModuleExtension.java
deleted file mode 100644
index cf9a5d0..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/WebModuleExtension.java
+++ /dev/null
@@ -1,58 +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
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.project.J2EEJavaProjectInfo;
-//import org.eclipse.jst.j2ee.internal.project.J2EENature;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface WebModuleExtension extends EarModuleExtension {
-
- static final String WEBSETTINGS_FILE_URI = ".j2ee"; //$NON-NLS-1$
-
-// void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand command);
-
- void addWLPProjects(IProject aProject, Set projectsToBuild);
-
-
- void setContextRootForModuleMapping(WebModule m, IProject nestedProject) throws CoreException;
-
- //J2EEImportOperationOLD createImportOperation(IProject nestedProject, WARFile warFile,
- // EARImportConfiguration importConfig);
-
- String getContentFolder(IProject project, IFile webSettingsFile);
-
- J2EEJavaProjectInfo createProjectInfo();
-
- boolean compareWebContextRoot(Module module, IProject project) throws CoreException;
-
- boolean hasRuntime(IProject project);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 21d44f0..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,30 +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.jst.j2ee.project.facet;
-
-import org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EARFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
-
- public EARFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel earFacet = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
- map.add(earFacet);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetUtils.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetUtils.java
deleted file mode 100644
index 45d7c67..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetUtils.java
+++ /dev/null
@@ -1,26 +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.jst.j2ee.project.facet;
-
-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.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class EARFacetUtils {
-
- public static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE);
- public static final IProjectFacetVersion EAR_12 = EAR_FACET.getVersion("1.2"); //$NON-NLS-1$
- public static final IProjectFacetVersion EAR_13 = EAR_FACET.getVersion("1.3"); //$NON-NLS-1$
- public static final IProjectFacetVersion EAR_14 = EAR_FACET.getVersion("1.4"); //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
deleted file mode 100644
index add0beb..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
+++ /dev/null
@@ -1,114 +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.jst.j2ee.project.facet;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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;
-
-public final class EarFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) cfg;
-
- if (monitor != null) {
- monitor.worked(1);
- }
- // Add WTP natures.
-
- WtpUtils.addNaturestoEAR(project);
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
- c.create(0, null);
-
- final IVirtualFolder earroot = c.getRootFolder();
- earroot.createLink(new Path("/" + model.getStringProperty(IEarFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
-
- if (!project.getFile(J2EEConstants.APPLICATION_DD_URI).exists()) {
- String ver = fv.getVersionString();
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
- EARArtifactEdit.createDeploymentDescriptor(project, nVer);
- }
- Set dependentProjects = new HashSet();
- dependentProjects.addAll((List) model.getProperty(IEarFacetInstallDataModelProperties.J2EE_PROJECTS_LIST));
- dependentProjects.addAll((List) model.getProperty(IEarFacetInstallDataModelProperties.JAVA_PROJECT_LIST));
- if (!dependentProjects.isEmpty()) {
- List dependentComponents = new ArrayList(dependentProjects.size());
- for (Iterator iterator = dependentProjects.iterator(); iterator.hasNext();) {
- IProject depProject = (IProject) iterator.next();
- IVirtualComponent depComp = ComponentCore.createComponent(depProject);
- if (depComp == null) {
- JavaProjectMigrationOperation utilOp = J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(depProject);
- utilOp.execute(null, null);
- depComp = ComponentCore.createComponent(depProject);
- }
-
- dependentComponents.add(depComp);
- }
-
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, c);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.addAll(dependentComponents);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
deleted file mode 100644
index 4dd10c7..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 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.jst.j2ee.project.facet;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-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.IRuntime;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetRuntimeHandler
-{
- /**
- * Private constructor. This class is not meant to be instantiated.
- */
-
- private EarFacetRuntimeHandler() {}
-
- public static void updateModuleProjectRuntime( final IProject earProject,
- final IProject moduleProject,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- final IFacetedProject earFacetedProject
- = ProjectFacetsManager.create( earProject );
-
- final IRuntime earRuntime = earFacetedProject.getRuntime();
-
- final IFacetedProject moduleFacetedProject
- = ProjectFacetsManager.create( moduleProject );
-
- if( moduleFacetedProject != null &&
- ! equals( earRuntime, moduleFacetedProject.getRuntime() ) )
- {
- boolean supports = true;
-
- if( earRuntime != null )
- {
- for( Iterator itr = moduleFacetedProject.getProjectFacets().iterator();
- itr.hasNext(); )
- {
- final IProjectFacetVersion fver
- = (IProjectFacetVersion) itr.next();
-
- if( ! earRuntime.supports( fver ) )
- {
- supports = false;
- break;
- }
- }
- }
-
- if( supports )
- {
- moduleFacetedProject.setRuntime( earRuntime, submon( monitor, 1 ) );
- }
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
- public static void updateModuleProjectRuntime( final IProject earProject,
- final Set moduleProjects,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", moduleProjects.size() );
- }
-
- try
- {
- for( Iterator itr = moduleProjects.iterator(); itr.hasNext(); )
- {
- final IProject moduleProject = (IProject) itr.next();
-
- updateModuleProjectRuntime( earProject, moduleProject,
- submon( monitor, 1 ) );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
- public static final class RuntimeChangedDelegate
-
- implements IDelegate
-
- {
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 10 ); //$NON-NLS-1$
- }
-
- try
- {
- // Compile the list of projects referenced by this ear project.
-
- final Set moduleProjects = new HashSet();
-
- final IVirtualComponent earvc
- = ComponentCore.createComponent( project );
-
- final IVirtualReference[] vrefs = earvc.getReferences();
-
- for( int i = 0; i < vrefs.length; i++ )
- {
- final IVirtualReference vref = vrefs[ i ];
- final IVirtualComponent vc = vref.getReferencedComponent();
-
- moduleProjects.add( vc.getProject() );
- }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
-
- // Attempt to change the runtime for each of the referenced projects.
-
- updateModuleProjectRuntime( project, moduleProjects,
- submon( monitor, 9 ) );
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
- }
-
- private static IProgressMonitor submon( final IProgressMonitor parent,
- final int ticks )
- {
- return ( parent == null ? null : new SubProgressMonitor( parent, ticks ) );
- }
-
- private static boolean equals( final Object obj1,
- final Object obj2 )
- {
- if( obj1 == obj2 )
- {
- return true;
- }
- else if( obj1 == null || obj2 == null )
- {
- return false;
- }
- else
- {
- return obj1.equals( obj2 );
- }
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java
deleted file mode 100644
index b23543c..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java
+++ /dev/null
@@ -1,135 +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.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectValidator;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetValidator
-
- implements IFacetedProjectValidator
-
-{
- private static final String MARKER_ID
- = J2EEPlugin.PLUGIN_ID + ".differentRuntimesDetected";
-
- public void validate( final IFacetedProject fproj )
-
- throws CoreException
-
- {
- final IVirtualComponent vc
- = ComponentCore.createComponent( fproj.getProject() );
-
- if( vc == null )
- {
- return;
- }
-
- if( fproj.hasProjectFacet( EARFacetUtils.EAR_FACET ) )
- {
- fproj.getProject().deleteMarkers( MARKER_ID, false,
- IResource.DEPTH_ZERO );
-
- final IVirtualReference[] refs = vc.getReferences();
-
- for( int i = 0; i < refs.length; i++ )
- {
- final IVirtualReference ref = refs[ i ];
- final IVirtualComponent refvc = ref.getReferencedComponent();
- final IProject refpj = refvc.getProject();
-
- validate( fproj, ProjectFacetsManager.create( refpj ) );
- }
- }
- else
- {
- final IVirtualComponent[] referencing
- = vc.getReferencingComponents();
-
- for( int i = 0; i < referencing.length; i++ )
- {
- final IVirtualComponent refvc = referencing[ i ];
-
- final IFacetedProject reffpj
- = ProjectFacetsManager.create( refvc.getProject() );
-
- if( reffpj.hasProjectFacet( EARFacetUtils.EAR_FACET ) )
- {
- validate( reffpj );
- }
- }
- }
- }
-
- private void validate( final IFacetedProject ear,
- final IFacetedProject module )
-
- throws CoreException
-
- {
- final IRuntime earRuntime = ear.getRuntime();
- final IRuntime moduleRuntime = module.getRuntime();
-
- if( earRuntime == null && moduleRuntime != null )
- {
- // Should this also be a warning?
- }
- else if( earRuntime != null && moduleRuntime == null )
- {
- // Should this also be a warning?
- }
- else if( earRuntime != null && moduleRuntime != null &&
- ! earRuntime.equals( moduleRuntime ) )
- {
- final String msg
- = NLS.bind( Resources.targettingDifferentRuntimes,
- module.getProject().getName() );
-
- final IMarker m = ear.createWarningMarker( MARKER_ID, msg );
-
- m.setAttribute( "moduleProject", module.getProject().getName() );
- m.setAttribute( "runtime1", ear.getRuntime().getName() );
- m.setAttribute( "runtime2", module.getRuntime().getName() );
- }
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String targettingDifferentRuntimes;
-
- static
- {
- initializeMessages( EarFacetValidator.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.properties b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.properties
deleted file mode 100644
index 17d4bab..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.properties
+++ /dev/null
@@ -1 +0,0 @@
-targettingDifferentRuntimes = Referenced module project {0} is targetting a different runtime.
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java
deleted file mode 100644
index e121e6b..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java
+++ /dev/null
@@ -1,92 +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.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-/**
- * Warning clean-up 12/05/2005
- */
-//import org.eclipse.wst.common.componentcore.ComponentCore;
-//import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetVersionChangeDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- /**
- * Warning clean-up 12/05/2005
- */
- //final IVirtualComponent c = ComponentCore.createComponent(project);
-
-// final StructureEdit edit
-// = StructureEdit.getStructureEditForWrite( project );
-//
-// try
-// {
-// final ComponentType oldctype
-// = StructureEdit.getComponentType( c );
-//
-// final ComponentType newctype
-// = ComponentcoreFactory.eINSTANCE.createComponentType();
-//
-// newctype.setComponentTypeId( oldctype.getComponentTypeId() );
-// newctype.setVersion( fv.getVersionString() );
-// newctype.getProperties().addAll( oldctype.getProperties() );
-//
-// StructureEdit.setComponentType( c, newctype );
-//
-// edit.saveIfNecessary( null );
-// }
-// finally
-// {
-// edit.dispose();
-// }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaProjectMigrationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaProjectMigrationDataModelProperties.java
deleted file mode 100644
index 0eab85c..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaProjectMigrationDataModelProperties.java
+++ /dev/null
@@ -1,21 +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.jst.j2ee.project.facet;
-
-
-public interface IJavaProjectMigrationDataModelProperties {
-
- /**
- * Required
- */
- public static final String PROJECT_NAME = "IJavaProjectMigrationDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaUtilityProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaUtilityProjectCreationDataModelProperties.java
deleted file mode 100644
index 9f90935..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaUtilityProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-public interface IJavaUtilityProjectCreationDataModelProperties {
-
- public static final String PROJECT_NAME = "IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
-
-// public static final String PROJECT_LOCATION = "IJavaUtilityProjectCreationDataModelProperties.PROJECT_LOCATION"; //$NON-NLS-1$
-
- public static final String EAR_PROJECT_NAME = "IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME"; //$NON-NLS-1$
-
- public static final String RUNTIME = "IJavaUtilityProjectCreationDataModelProperties.RUNTIME"; //$NON-NLS-1$
-
- public static final String SOURCE_FOLDER = "IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IUtilityFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IUtilityFacetInstallDataModelProperties.java
deleted file mode 100644
index ce202cc..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IUtilityFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,18 +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.jst.j2ee.project.facet;
-
-
-
-
-public interface IUtilityFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationDataModelProvider.java
deleted file mode 100644
index 54b3101..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationDataModelProvider.java
+++ /dev/null
@@ -1,63 +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.jst.j2ee.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * This dataModel is a common super class used for creation of WTP Components.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public class JavaProjectMigrationDataModelProvider extends AbstractDataModelProvider implements IJavaProjectMigrationDataModelProperties {
-
- public void init() {
- super.init();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_NAME);
- return propertyNames;
- }
-
- public void propertyChanged(DataModelEvent event) {
- if (event.getFlag() == DataModelEvent.VALUE_CHG) {
- event.getDataModel();
- }
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- return true;
- }
-
- public Object getDefaultProperty(String propertyName) {
- return super.getDefaultProperty(propertyName);
- }
-
- public IStatus validate(String propertyName) {
-
- return OK_STATUS;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new JavaProjectMigrationOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationOperation.java
deleted file mode 100644
index b9839d3..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationOperation.java
+++ /dev/null
@@ -1,70 +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.jst.j2ee.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class JavaProjectMigrationOperation extends AbstractDataModelOperation implements IJavaProjectMigrationDataModelProperties {
-
-
-
- public JavaProjectMigrationOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
-
-
- IDataModel jdm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-
- jdm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(PROJECT_NAME));
-
- jdm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.4"); //$NON-NLS-1$
-
- IDataModel udm = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
- try {
- udm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(PROJECT_NAME));
- udm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.0"); //$NON-NLS-1$
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(PROJECT_NAME));
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(jdm);
- map.add(udm);
-
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- return OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationDataModelProvider.java
deleted file mode 100644
index b661a11..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IUtilityJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- *
- * @deprecated
- * @see UtilityProjectCreationDataModelProvider
- */
-
-public class JavaUtilityComponentCreationDataModelProvider
- extends JavaComponentCreationDataModelProvider implements IUtilityJavaComponentCreationDataModelProperties{
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EAR_PROJECT_NAME);
- return propertyNames;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new JavaUtilityComponentCreationFacetOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationFacetOperation.java
deleted file mode 100644
index a009b33..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class JavaUtilityComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation {
-
- public JavaUtilityComponentCreationFacetOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
- IStatus result = OK_STATUS;
- try {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, (String) model.getProperty(JavaUtilityComponentCreationDataModelProvider.PROJECT_NAME));
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(setupJavaInstallAction());
-
- IDataModel newModel = setupUtilityInstallAction(model);
- map.add( newModel );
-
- setRuntime(newModel, dm); // Setting runtime property
- setAddToEARFromWizard(newModel);
- result = dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- return result;
- }
-
- protected IDataModel setupUtilityInstallAction(IDataModel aDM) {
- IDataModel dm = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
- try {
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(JavaUtilityComponentCreationDataModelProvider.PROJECT_NAME));
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.0"); //$NON-NLS-1$
- dm.setProperty(IUtilityFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(JavaUtilityComponentCreationDataModelProvider.RUNTIME_TARGET_ID));
- dm.setProperty(IUtilityFacetInstallDataModelProperties.CONFIG_FOLDER,
- model.getProperty(JavaUtilityComponentCreationDataModelProvider.JAVASOURCE_FOLDER));
- dm.setStringProperty(IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME,model.getStringProperty(JavaUtilityComponentCreationDataModelProvider.EAR_PROJECT_NAME));
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- return dm;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationDataModelProvider.java
deleted file mode 100644
index ba73143..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-
-public class JavaUtilityProjectCreationDataModelProvider
- extends AbstractDataModelProvider implements IJavaUtilityProjectCreationDataModelProperties{
-
- public JavaUtilityProjectCreationDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_NAME);
- //propertyNames.add(PROJECT_LOCATION);
- propertyNames.add(EAR_PROJECT_NAME);
- propertyNames.add(RUNTIME);
- propertyNames.add(SOURCE_FOLDER);
- return propertyNames;
- }
-
-
- public IDataModelOperation getDefaultOperation() {
- return new JavaUtilityProjectCreationOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationOperation.java
deleted file mode 100644
index a7baf75..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationOperation.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class JavaUtilityProjectCreationOperation extends AbstractDataModelOperation implements IJavaUtilityProjectCreationDataModelProperties{
-
-
-
- public JavaUtilityProjectCreationOperation(IDataModel model) {
- super(model);
- }
-
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
- IStatus stat = OK_STATUS;
-
- String projectName = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME );
- String earProjectName = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME );;
- String javaSourceFolder = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER );
-
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = (IRuntime) model.getProperty(IJavaUtilityProjectCreationDataModelProperties.RUNTIME);
-
- IDataModel dm = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
-
-
- //IDataModel pdm = dm.getNestedModel( IFacetProjectCreationDataModelProperties.NESTED_PROJECT_DM );
- //pdm.setStringProperty( IProjectCreationPropertiesNew.PROJECT_LOCATION, model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.PROJECT_LOCATION ) );
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(UtilityProjectCreationDataModelProvider.FACET_DM_MAP);
-
- IDataModel javadm = map.getFacetDataModel( IModuleConstants.JST_JAVA );
- IDataModel utildm = map.getFacetDataModel( J2EEProjectUtilities.UTILITY );
-
-
- javadm.setProperty( JavaFacetInstallDataModelProvider.FACET_PROJECT_NAME,
- projectName);
-
-
- javadm.setProperty( JavaFacetInstallDataModelProvider.SOURCE_FOLDER_NAME,
- javaSourceFolder);
-
-
- utildm.setProperty( IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME, earProjectName);
-
- utildm.setProperty( IUtilityFacetInstallDataModelProperties.FACET_RUNTIME, runtime );
- dm.setProperty(UtilityProjectCreationDataModelProvider.FACET_RUNTIME, runtime);
-
- FacetProjectCreationOperation op = new FacetProjectCreationOperation(dm);
- try {
- stat = op.execute( monitor, null );
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- return stat;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDataModelProvider.java
deleted file mode 100644
index e13df82..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class UtilityFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IUtilityFacetInstallDataModelProperties {
-
- public Object getDefaultProperty(String propertyName) {
- if (FACET_ID.equals(propertyName)) {
- return J2EEProjectUtilities.UTILITY;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return 0;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java
deleted file mode 100644
index 594620d..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java
+++ /dev/null
@@ -1,155 +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.jst.j2ee.project.facet;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-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.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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.common.project.facet.core.runtime.IRuntime;
-
-public final class UtilityFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
-
- final IDataModel model = (IDataModel) cfg;
-
- // Add WTP natures.
-
- WtpUtils.addNatures(project);
-
- // Setup the flexible project structure.
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
-
- c.create(0, null);
-
- final IVirtualFolder jsrc = c.getRootFolder();
- final IJavaProject jproj = JavaCore.create(project);
- final IClasspathEntry[] cp = jproj.getRawClasspath();
-
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
-
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IPath path = cpe.getPath().removeFirstSegments(1);
- if (path.isEmpty()) {
- path = new Path("/"); //$NON-NLS-1$
- }
- jsrc.createLink(path, 0, null);
- }
- }
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
-
- final IVirtualFolder root = c.getRootFolder();
-
- IContainer container = null;
-
- if (root.getProjectRelativePath().segmentCount() == 0) {
- container = project;
- } else {
- container = project.getFolder(root.getProjectRelativePath());
- }
-
- try {
- if (container != null)
- createManifest(project, container, monitor);
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- } catch (InterruptedException e) {
- Logger.getLogger().logError(e);
- }
-
-
- ClasspathHelper.removeClasspathEntries(project, fv);
-
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
-
- // Associate with an EAR, if necessary.
- if (model.getBooleanProperty(IUtilityFacetInstallDataModelProperties.ADD_TO_EAR)) {
- final String earProjectName = model.getStringProperty(IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- if (earProjectName != null && earProjectName != "") {
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- if (!earProject.exists()){
- installEARFacet(J2EEVersionConstants.VERSION_1_4_TEXT, earProjectName, (IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME), monitor);
- }
-
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(c);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- }
- }
-
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- if (monitor != null) {
- monitor.worked(1);
- }
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java
deleted file mode 100644
index a5f3ead..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java
+++ /dev/null
@@ -1,72 +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.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class UtilityFacetUnInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try{
- //remove .component file
- IFile file = project.getFile( StructureEdit.MODULE_META_FILE_NAME );
- file.delete( true, monitor );
-
- //remove manifest file
- final IVirtualComponent c = ComponentCore.createComponent(project);
- final IVirtualFolder root = c.getRootFolder();
- IContainer container = null;
-
- if (root.getProjectRelativePath().segmentCount() == 0) {
- container = project;
- } else {
- container = project.getFolder(root.getProjectRelativePath());
- }
-
- IFile manifestFile = container.getFile(new Path(J2EEConstants.MANIFEST_URI));
- manifestFile.delete( true, monitor );
-
- IFolder manifestFolder = container.getFolder( new Path(J2EEConstants.META_INF) );
- manifestFolder.delete( true, monitor );
-
- //remove module core nature
- WtpUtils.removeNatures( project );
-
- //remove server class path container
- ClasspathHelper.removeClasspathEntries( project, fv );
-
- }finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java
deleted file mode 100644
index b1f9e5c..0000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,45 +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.jst.j2ee.project.facet;
-
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-public class UtilityProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
- public UtilityProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- map.add(javaFacet);
- IDataModel utilFacet = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
- map.add(utilFacet);
-
- utilFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
- setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
- }else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_EAR, event.getProperty());
- }
- }
- });
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/icons/11_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/11_cmpbean_obj.gif
deleted file mode 100644
index 5db4e72..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/11_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/11_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/11_ejb_obj.gif
deleted file mode 100644
index 445aa37..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/11_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/11_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/11_ejbjar_obj.gif
deleted file mode 100644
index f34adc9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/11_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/12_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/12_ear_obj.gif
deleted file mode 100644
index f66e7a9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/12_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/13_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/13_ear_obj.gif
deleted file mode 100644
index 07cd6ab..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/13_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/20_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/20_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/20_ejb_obj.gif
deleted file mode 100644
index 7dbebc4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/20_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/20_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/20_ejbjar_obj.gif
deleted file mode 100644
index 6b594c9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/20_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AccessIntent.gif b/plugins/org.eclipse.jst.j2ee/icons/AccessIntent.gif
deleted file mode 100644
index baf4678..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AccessIntent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ApplClientJar.gif b/plugins/org.eclipse.jst.j2ee/icons/ApplClientJar.gif
deleted file mode 100644
index 4423578..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ApplClientJar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptor.gif
deleted file mode 100644
index f0ff233..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptorCreateMethodPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptorCreateMethodPermission.gif
deleted file mode 100644
index f37ae2b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptorCreateMethodPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee/icons/AuthenticationMechanism.gif
deleted file mode 100644
index 13da128..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanCache.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanCache.gif
deleted file mode 100644
index 34a760d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanCache.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanInstall.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanInstall.gif
deleted file mode 100644
index dd5d5d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanInstall.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanInternationalization.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanInternationalization.gif
deleted file mode 100644
index 8fdc9a0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanInternationalization.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanStructure.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanStructure.gif
deleted file mode 100644
index 4e4b930..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanStructure.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPAttribute.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPAttribute.gif
deleted file mode 100644
index 8f2b1d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeCreateContainerManagedEntity.gif
deleted file mode 100644
index 5a44170..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeCreateContainerManagedEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeold.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeold.gif
deleted file mode 100644
index f143c43..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeold.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPKeyAttribute.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPKeyAttribute.gif
deleted file mode 100644
index f438dc8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPKeyAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee/icons/ConfigProperty.gif
deleted file mode 100644
index 586eb81..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Connector.gif b/plugins/org.eclipse.jst.j2ee/icons/Connector.gif
deleted file mode 100644
index c0eea5b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Connector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateLicense.gif b/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateLicense.gif
deleted file mode 100644
index 11aef62..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateLicense.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateResourceAdapter.gif
deleted file mode 100644
index f37ae2b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerActivitySession.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerActivitySession.gif
deleted file mode 100644
index 29aedbc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerActivitySession.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntity.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityCreateEntity.gif
deleted file mode 100644
index 37517a0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityCreateEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtension.gif
deleted file mode 100644
index b8c4450..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtensionCreateEjbRelationshipRole.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtensionCreateEjbRelationshipRole.gif
deleted file mode 100644
index 9303631..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtensionCreateEjbRelationshipRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityno.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityno.gif
deleted file mode 100644
index e93cc1d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityno.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Copy of CreateChild.gif b/plugins/org.eclipse.jst.j2ee/icons/Copy of CreateChild.gif
deleted file mode 100644
index 81aa4a2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Copy of CreateChild.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CreateChild.gif b/plugins/org.eclipse.jst.j2ee/icons/CreateChild.gif
deleted file mode 100644
index 81aa4a2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CreateChild.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EAR.gif b/plugins/org.eclipse.jst.j2ee/icons/EAR.gif
deleted file mode 100644
index b5630b3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EAR.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJar.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJar.gif
deleted file mode 100644
index f8b5c0a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateContainerManagedEntity.gif
deleted file mode 100644
index 1e19690..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateContainerManagedEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateEntity.gif
deleted file mode 100644
index 5a44170..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtension.gif
deleted file mode 100644
index 7438a9d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtensionCreateEjbGeneralization.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtensionCreateEjbGeneralization.gif
deleted file mode 100644
index 0029517..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtensionCreateEjbGeneralization.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBMethodCategory.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBMethodCategory.gif
deleted file mode 100644
index 7438a9d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBMethodCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbGeneralization.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbGeneralization.gif
deleted file mode 100644
index aa490b6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbGeneralization.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbKeyRelationshipRole.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbKeyRelationshipRole.gif
deleted file mode 100644
index 1b12ecf..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbKeyRelationshipRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbModelFile.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbModelFile.gif
deleted file mode 100644
index dfbc529..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbModelFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbModule.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbModule.gif
deleted file mode 100644
index f8b5c0a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbModule.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbModuleExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbModuleExtension.gif
deleted file mode 100644
index e34cdad..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbModuleExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationship.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbRelationship.gif
deleted file mode 100644
index bd63583..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationship.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationshipRole.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbRelationshipRole.gif
deleted file mode 100644
index 14902a0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationshipRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbextModelFile.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbextModelFile.gif
deleted file mode 100644
index dfbc529..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbextModelFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbqlFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbqlFinderDescriptor.gif
deleted file mode 100644
index 586eb81..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbqlFinderDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBean.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBean.gif
deleted file mode 100644
index 586eb81..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateContainerManagedEntity.gif
deleted file mode 100644
index 99722d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateContainerManagedEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateEntity.gif
deleted file mode 100644
index 99722d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtension.gif
deleted file mode 100644
index c0eea5b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtensionCreateReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtensionCreateReadOnlyAttributes.gif
deleted file mode 100644
index 11aef62..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtensionCreateReadOnlyAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Entity.gif b/plugins/org.eclipse.jst.j2ee/icons/Entity.gif
deleted file mode 100644
index 2969141..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Entity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityCreateContainerManagedEntity.gif
deleted file mode 100644
index 0029517..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityCreateContainerManagedEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityEJB.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityEJB.gif
deleted file mode 100644
index 8046811..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityEJB.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityExtension.gif
deleted file mode 100644
index f0ff233..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityExtensionCreateReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityExtensionCreateReadOnlyAttributes.gif
deleted file mode 100644
index f37ae2b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityExtensionCreateReadOnlyAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/FinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/FinderDescriptor.gif
deleted file mode 100644
index 2969141..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/FinderDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/FullSelectFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/FullSelectFinderDescriptor.gif
deleted file mode 100644
index 13da128..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/FullSelectFinderDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Identity.gif b/plugins/org.eclipse.jst.j2ee/icons/Identity.gif
deleted file mode 100644
index 51cf89f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Identity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModule.gif b/plugins/org.eclipse.jst.j2ee/icons/JavaClientModule.gif
deleted file mode 100644
index 12a9ed7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModule.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModuleExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/JavaClientModuleExtension.gif
deleted file mode 100644
index 12a9ed7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModuleExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/License.gif b/plugins/org.eclipse.jst.j2ee/icons/License.gif
deleted file mode 100644
index f0ff233..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/License.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/LocalTran.gif b/plugins/org.eclipse.jst.j2ee/icons/LocalTran.gif
deleted file mode 100644
index e652041..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/LocalTran.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodElement.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodElement.gif
deleted file mode 100644
index c3e27cd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodPermission.gif
deleted file mode 100644
index db55cc7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodPermissionCreateMethodElement.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodPermissionCreateMethodElement.gif
deleted file mode 100644
index 11aef62..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodPermissionCreateMethodElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodSessionAttribute.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodSessionAttribute.gif
deleted file mode 100644
index 6836424..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodSessionAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodTransaction.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodTransaction.gif
deleted file mode 100644
index c33f3b2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodTransaction.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodTransactionCreateMethodElement.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodTransactionCreateMethodElement.gif
deleted file mode 100644
index 9303631..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodTransactionCreateMethodElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/PersistenceSecurityIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/PersistenceSecurityIdentity.gif
deleted file mode 100644
index adedfe3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/PersistenceSecurityIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/ReadOnlyAttributes.gif
deleted file mode 100644
index 9f50c46..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ReadOnlyAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapter.gif
deleted file mode 100644
index b8c4450..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateAuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateAuthenticationMechanism.gif
deleted file mode 100644
index 0029517..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateAuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateConfigProperty.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateConfigProperty.gif
deleted file mode 100644
index 37517a0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateSecurityPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateSecurityPermission.gif
deleted file mode 100644
index 9303631..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateSecurityPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/RunAsMode.gif b/plugins/org.eclipse.jst.j2ee/icons/RunAsMode.gif
deleted file mode 100644
index 8ed70a4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/RunAsMode.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/RunAsSpecifiedIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/RunAsSpecifiedIdentity.gif
deleted file mode 100644
index 585ac7a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/RunAsSpecifiedIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SecurityIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/SecurityIdentity.gif
deleted file mode 100644
index 56587d8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SecurityIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/SecurityPermission.gif
deleted file mode 100644
index 2969141..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SecurityPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Session.gif b/plugins/org.eclipse.jst.j2ee/icons/Session.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Session.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionCreateContainerManagedEntity.gif
deleted file mode 100644
index 8ac7793..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateContainerManagedEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionCreateEntity.gif
deleted file mode 100644
index 8ac7793..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateEntity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionExtension.gif
deleted file mode 100644
index 7c28109..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionExtensionCreateReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionExtensionCreateReadOnlyAttributes.gif
deleted file mode 100644
index 37517a0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionExtensionCreateReadOnlyAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/UseCallerIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/UseCallerIdentity.gif
deleted file mode 100644
index 8e385e9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/UseCallerIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/UseSystemIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/UseSystemIdentity.gif
deleted file mode 100644
index cf76ebc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/UseSystemIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/UserFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/UserFinderDescriptor.gif
deleted file mode 100644
index 29d1aab..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/UserFinderDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WAR.gif b/plugins/org.eclipse.jst.j2ee/icons/WAR.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WAR.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WebModule.gif b/plugins/org.eclipse.jst.j2ee/icons/WebModule.gif
deleted file mode 100644
index bf20f70..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WebModule.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WebModuleExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/WebModuleExtension.gif
deleted file mode 100644
index bf20f70..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WebModuleExtension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WhereClauseFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/WhereClauseFinderDescriptor.gif
deleted file mode 100644
index d85a9d0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WhereClauseFinderDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/access_intent_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/access_intent_obj.gif
deleted file mode 100644
index caf09ea..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/access_intent_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/access_intent_read_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/access_intent_read_obj.gif
deleted file mode 100644
index b5dd219..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/access_intent_read_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/access_intent_update_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/access_intent_update_obj.gif
deleted file mode 100644
index b3307fe..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/access_intent_update_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/appClientExt_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/appClientExt_obj.gif
deleted file mode 100644
index 910df49..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/appClientExt_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/assemblyDescriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/assemblyDescriptor_obj.gif
deleted file mode 100644
index 405cae6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/assemblyDescriptor_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/attributeKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/attributeKey_obj.gif
deleted file mode 100644
index 534b37a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/attributeKey_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/attribute_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/attribute_obj.gif
deleted file mode 100644
index cfb58e4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/attribute_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/bmp.gif b/plugins/org.eclipse.jst.j2ee/icons/bmp.gif
deleted file mode 100644
index ebc18b5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/bmp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/bmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/bmpEntity_obj.gif
deleted file mode 100644
index 797df13..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/bmpEntity_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/cmp.gif b/plugins/org.eclipse.jst.j2ee/icons/cmp.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/cmp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/cmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/cmpEntity_obj.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/cmpEntity_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/cmpField_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/cmpField_obj.gif
deleted file mode 100644
index 6c66a3d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/cmpField_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/deaccsintent_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/deaccsintent_ovr.gif
deleted file mode 100644
index 327c3f3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/deaccsintent_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/earBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/earBinding_obj.gif
deleted file mode 100644
index 2c1bc41..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/earBinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/earExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/earExtension_obj.gif
deleted file mode 100644
index 07c56bc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/earExtension_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/earFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/earFile_obj.gif
deleted file mode 100644
index 4468d66..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/earFile_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejb16.gif b/plugins/org.eclipse.jst.j2ee/icons/ejb16.gif
deleted file mode 100644
index f8b5c0a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejb16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejb16old.GIF b/plugins/org.eclipse.jst.j2ee/icons/ejb16old.GIF
deleted file mode 100644
index 1e4a57c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejb16old.GIF
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbBinding_obj.gif
deleted file mode 100644
index c97e6ee..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbBinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbExtension_obj.gif
deleted file mode 100644
index 12184cf..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbExtension_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbJar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbJar_obj.gif
deleted file mode 100644
index f8b5c0a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbJar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbRef_obj.gif
deleted file mode 100644
index 5155069..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbRef_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/entitybean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/entitybean_obj.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/entitybean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/entitybean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/entitybean_wiz.gif
deleted file mode 100644
index 5fb8929..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/entitybean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/error_co.gif b/plugins/org.eclipse.jst.j2ee/icons/error_co.gif
deleted file mode 100644
index 119dccc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/error_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/field.gif b/plugins/org.eclipse.jst.j2ee/icons/field.gif
deleted file mode 100644
index 06d38f5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/field.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/finder_descriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/finder_descriptor_obj.gif
deleted file mode 100644
index 5533c0b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/finder_descriptor_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/foreignKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/foreignKey_obj.gif
deleted file mode 100644
index d261a1d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/foreignKey_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/frnkeyrelnshp_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/frnkeyrelnshp_ovr.gif
deleted file mode 100644
index cee9ff6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/frnkeyrelnshp_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Field_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Field_ejb.gif
deleted file mode 100644
index 06d38f5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Field_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowBaseTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowBaseTypes_ejb.gif
deleted file mode 100644
index 9d8c615..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowBaseTypes_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowGenTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowGenTypes_ejb.gif
deleted file mode 100644
index ba4b1c3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowGenTypes_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Types_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Types_ejb.gif
deleted file mode 100644
index e0ecb6a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Types_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateResourceRefBinding_defaultAuth_BasicAuthData.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateResourceRefBinding_defaultAuth_BasicAuthData.gif
deleted file mode 100644
index 453145c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateResourceRefBinding_defaultAuth_BasicAuthData.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateRunAsSpecifiedIdentity_identity_Identity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateRunAsSpecifiedIdentity_identity_Identity.gif
deleted file mode 100644
index 82bd4bd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateRunAsSpecifiedIdentity_identity_Identity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_export_wiz.gif
deleted file mode 100644
index 6f83300..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_export_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createEJB_RDB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createEJB_RDB.gif
deleted file mode 100644
index a6627bd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createEJB_RDB.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createRDB_EJB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createRDB_EJB.gif
deleted file mode 100644
index c323270..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createRDB_EJB.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejb_rdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejb_rdbmapping_wiz.gif
deleted file mode 100644
index 31748bd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejb_rdbmapping_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbclientjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbcomposer_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbcomposer_wiz.gif
deleted file mode 100644
index 847be21..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbcomposer_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ear_wiz.gif
deleted file mode 100644
index 2270b17..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_rar_wiz.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_war_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_ddl.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_ddl.gif
deleted file mode 100644
index fabe558..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_ddl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_rmic.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_rmic.gif
deleted file mode 100644
index b0fefa2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_rmic.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ear_wiz.gif
deleted file mode 100644
index 099201b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ejbjar_wiz.gif
deleted file mode 100644
index 5644b48..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_rar_wiz.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_war_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/new_appclientproject_wiz.gif
deleted file mode 100644
index cd94cc4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/new_appclientproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newaccessbean_wiz.gif
deleted file mode 100644
index 1e0ca04..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newaccessbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejb_wiz.gif
deleted file mode 100644
index 73561c7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbex_wiz.gif
deleted file mode 100644
index 6fbde80..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbjar_wiz.gif
deleted file mode 100644
index 219e4c3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/re_execute.gif
deleted file mode 100644
index 8f943a8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/re_execute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/table_mapping_strategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/table_mapping_strategy_wiz.gif
deleted file mode 100644
index 88d2c13..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/table_mapping_strategy_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/data_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/data_view.gif
deleted file mode 100644
index 8f2b1d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/data_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ear_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ear_ed_view.gif
deleted file mode 100644
index 2800367..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ear_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/earext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/earext_ed_view.gif
deleted file mode 100644
index e9b3413..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/earext_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_ed_view.gif
deleted file mode 100644
index ac0972f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_rdbmapping_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_rdbmapping_view.gif
deleted file mode 100644
index 650671f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_rdbmapping_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_view.gif
deleted file mode 100644
index ac0972f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejbext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejbext_ed_view.gif
deleted file mode 100644
index e9b3413..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejbext_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_perspective.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/table_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/table_view.gif
deleted file mode 100644
index b99b45c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/table_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Field_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Field_ejb.gif
deleted file mode 100644
index bc24f1a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Field_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowBaseTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowBaseTypes_ejb.gif
deleted file mode 100644
index d723a5f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowBaseTypes_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowGenTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowGenTypes_ejb.gif
deleted file mode 100644
index 956e8b2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowGenTypes_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Types_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Types_ejb.gif
deleted file mode 100644
index 645b1be..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Types_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_export_wiz.gif
deleted file mode 100644
index f4c1946..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_export_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_import_wiz.gif
deleted file mode 100644
index 8311eb3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createEJB_RDB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createEJB_RDB.gif
deleted file mode 100644
index 07c8fda..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createEJB_RDB.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createRDB_EJB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createRDB_EJB.gif
deleted file mode 100644
index 4c3edb1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createRDB_EJB.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejb_rdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejb_rdbmapping_wiz.gif
deleted file mode 100644
index e321a49..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejb_rdbmapping_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 849fea4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbclientjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbcomposer_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbcomposer_wiz.gif
deleted file mode 100644
index f3ad6c1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbcomposer_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ear_wiz.gif
deleted file mode 100644
index 0df2346..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 86f296b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_rar_wiz.gif
deleted file mode 100644
index 2f32b11..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_war_wiz.gif
deleted file mode 100644
index 211d4e5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_ddl.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_ddl.gif
deleted file mode 100644
index 4cf6b34..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_ddl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_rmic.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_rmic.gif
deleted file mode 100644
index e579151..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_rmic.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ear_wiz.gif
deleted file mode 100644
index 69b92b9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ejbjar_wiz.gif
deleted file mode 100644
index e553976..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_rar_wiz.gif
deleted file mode 100644
index d4d2308..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_war_wiz.gif
deleted file mode 100644
index 1cd2eb0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/new_appclientproject_wiz.gif
deleted file mode 100644
index bf1b020..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/new_appclientproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newaccessbean_wiz.gif
deleted file mode 100644
index 73bdda6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newaccessbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newappclient_wiz.gif
deleted file mode 100644
index 17a0036..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 36ea3b1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newear_wiz.gif
deleted file mode 100644
index fcee4ff..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejb_wiz.gif
deleted file mode 100644
index 96ce90f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbex_wiz.gif
deleted file mode 100644
index 56c4b3d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbjar_wiz.gif
deleted file mode 100644
index ae1d521..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbprj_wiz.gif
deleted file mode 100644
index e92896b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newservlet_wiz.gif
deleted file mode 100644
index 76b0a8f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newwar_wiz.gif
deleted file mode 100644
index be1414a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/re_execute.gif
deleted file mode 100644
index 7f056da..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/re_execute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/table_mapping_strategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/table_mapping_strategy_wiz.gif
deleted file mode 100644
index 48314a1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/table_mapping_strategy_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Field_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Field_ejb.gif
deleted file mode 100644
index 06d38f5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Field_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowBaseTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowBaseTypes_ejb.gif
deleted file mode 100644
index 9d8c615..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowBaseTypes_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowGenTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowGenTypes_ejb.gif
deleted file mode 100644
index ba4b1c3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowGenTypes_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Types_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Types_ejb.gif
deleted file mode 100644
index e0ecb6a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Types_ejb.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_export_wiz.gif
deleted file mode 100644
index 6f83300..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_export_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createEJB_RDB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createEJB_RDB.gif
deleted file mode 100644
index a6627bd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createEJB_RDB.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createRDB_EJB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createRDB_EJB.gif
deleted file mode 100644
index c323270..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createRDB_EJB.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejb_rdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejb_rdbmapping_wiz.gif
deleted file mode 100644
index 31748bd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejb_rdbmapping_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbclientjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbcomposer_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbcomposer_wiz.gif
deleted file mode 100644
index 847be21..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbcomposer_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ear_wiz.gif
deleted file mode 100644
index 2270b17..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_rar_wiz.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_war_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_ddl.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_ddl.gif
deleted file mode 100644
index fabe558..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_ddl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_rmic.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_rmic.gif
deleted file mode 100644
index b0fefa2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_rmic.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ear_wiz.gif
deleted file mode 100644
index 099201b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ejbjar_wiz.gif
deleted file mode 100644
index 5644b48..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_rar_wiz.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_war_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/new_appclientproject_wiz.gif
deleted file mode 100644
index cd94cc4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/new_appclientproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newaccessbean_wiz.gif
deleted file mode 100644
index 1e0ca04..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newaccessbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newear_wiz.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejb_wiz.gif
deleted file mode 100644
index 73561c7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbex_wiz.gif
deleted file mode 100644
index 6fbde80..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbjar_wiz.gif
deleted file mode 100644
index 219e4c3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/re_execute.gif
deleted file mode 100644
index 8f943a8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/re_execute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/table_mapping_strategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/table_mapping_strategy_wiz.gif
deleted file mode 100644
index 88d2c13..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/table_mapping_strategy_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/data_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/data_view.gif
deleted file mode 100644
index 8f2b1d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/data_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ear_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ear_ed_view.gif
deleted file mode 100644
index 2800367..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ear_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/earext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/earext_ed_view.gif
deleted file mode 100644
index e9b3413..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/earext_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_ed_view.gif
deleted file mode 100644
index ac0972f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_rdbmapping_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_rdbmapping_view.gif
deleted file mode 100644
index 650671f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_rdbmapping_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_view.gif
deleted file mode 100644
index ac0972f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejbext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejbext_ed_view.gif
deleted file mode 100644
index e9b3413..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejbext_ed_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_perspective.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/table_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/table_view.gif
deleted file mode 100644
index b99b45c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/table_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/EJBDataTransformer.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/EJBDataTransformer.gif
deleted file mode 100644
index dbfb4e6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/EJBDataTransformer.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/ForwardFlattenedFKComposer.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/ForwardFlattenedFKComposer.gif
deleted file mode 100644
index 40ca08b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/ForwardFlattenedFKComposer.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/InheritedPrimaryTableStrategy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/InheritedPrimaryTableStrategy.gif
deleted file mode 100644
index 7ca8515..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/InheritedPrimaryTableStrategy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/PrimaryTableStrategy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/PrimaryTableStrategy.gif
deleted file mode 100644
index 64ec286..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/PrimaryTableStrategy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/RDBMemberType.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/RDBMemberType.gif
deleted file mode 100644
index 94fddb7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/RDBMemberType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/arraytype_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/arraytype_obj.gif
deleted file mode 100644
index 9c27c10..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/arraytype_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/class.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/class.gif
deleted file mode 100644
index 6279478..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/class.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/datatype_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/datatype_obj.gif
deleted file mode 100644
index 805379d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/datatype_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/error_co.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/error_co.gif
deleted file mode 100644
index 119dccc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/error_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/folder.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/form_banner.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/home_nav.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/home_nav.gif
deleted file mode 100644
index fd0c669..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/home_nav.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/interface.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/interface.gif
deleted file mode 100644
index 21325ca..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/interface.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/jcu_obj.gif
deleted file mode 100644
index 36a73ac..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/jcu_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/showerr_tsk.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showerr_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/showwarn_tsk.gif
deleted file mode 100644
index 14009e9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showwarn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/warn_tsk.gif
deleted file mode 100644
index e2b751d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warning_co.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/warning_co.gif
deleted file mode 100644
index ee2dac4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warning_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_cmpbean_obj.gif
deleted file mode 100644
index 5db4e72..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejb_obj.gif
deleted file mode 100644
index 445aa37..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejbjar_obj.gif
deleted file mode 100644
index f34adc9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_deploy.gif
deleted file mode 100644
index f4e43f0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_obj.gif
deleted file mode 100644
index f66e7a9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_deploy.gif
deleted file mode 100644
index d8a2254..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_obj.gif
deleted file mode 100644
index 07cd6ab..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/14_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/14_ear_obj.gif
deleted file mode 100644
index 54b9b17..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/14_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejb_obj.gif
deleted file mode 100644
index 7dbebc4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejbjar_obj.gif
deleted file mode 100644
index 6b594c9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_cmpbean_obj.gif
deleted file mode 100644
index 35835bc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejb_obj.gif
deleted file mode 100644
index 673ba6a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejbjar_wiz.gif
deleted file mode 100644
index 9dae052..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/AbstractAuthData.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/AbstractAuthData.gif
deleted file mode 100644
index 9840795..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/AbstractAuthData.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/BasicAuthData.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/BasicAuthData.gif
deleted file mode 100644
index 474fe97..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/BasicAuthData.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/CompatibilityDescriptionGroup.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/CompatibilityDescriptionGroup.gif
deleted file mode 100644
index e4b530e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/CompatibilityDescriptionGroup.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EJBLocalRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EJBLocalRef.gif
deleted file mode 100644
index 49f813f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EJBLocalRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRef.gif
deleted file mode 100644
index 5ca132d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRefBinding.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRefBinding.gif
deleted file mode 100644
index 5dac057..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRefBinding.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EnvEntry.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EnvEntry.gif
deleted file mode 100644
index 734bfbd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EnvEntry.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/Identity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/Identity.gif
deleted file mode 100644
index 75a9caa..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/Identity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRef.gif
deleted file mode 100644
index 11b1dbb..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRefBinding.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRefBinding.gif
deleted file mode 100644
index 2ceb35e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRefBinding.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRef.gif
deleted file mode 100644
index f7e1f5b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRefBinding.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRefBinding.gif
deleted file mode 100644
index 1d8d3e8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRefBinding.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/RunAsSpecifiedIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/RunAsSpecifiedIdentity.gif
deleted file mode 100644
index 483f3c2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/RunAsSpecifiedIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SOAPHeader.gif
deleted file mode 100644
index 7bf9926..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SOAPHeader.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityIdentity.gif
deleted file mode 100644
index b05d25b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRole.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRole.gif
deleted file mode 100644
index 16472b8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRoleRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRoleRef.gif
deleted file mode 100644
index 37f38ea..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRoleRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/UseCallerIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/UseCallerIdentity.gif
deleted file mode 100644
index ffe7031..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/UseCallerIdentity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_obj.gif
deleted file mode 100644
index caf09ea..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_read_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_read_obj.gif
deleted file mode 100644
index b5dd219..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_read_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_update_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_update_obj.gif
deleted file mode 100644
index b3307fe..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_update_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/accessbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/accessbean_obj.gif
deleted file mode 100644
index 96411b8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/accessbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/annotation_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appClientExt_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appClientExt_obj.gif
deleted file mode 100644
index 910df49..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appClientExt_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12.gif
deleted file mode 100644
index 6c304db..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12_deploy.gif
deleted file mode 100644
index da01785..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13.gif
deleted file mode 100644
index 556473c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13_deploy.gif
deleted file mode 100644
index e1d605b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14.gif
deleted file mode 100644
index b248380..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14_deploy.gif
deleted file mode 100644
index b0d08af..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_deploy.gif
deleted file mode 100644
index bb973cd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/applclientJAR_obj.GIF b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/applclientJAR_obj.GIF
deleted file mode 100644
index 4423578..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/applclientJAR_obj.GIF
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/assemblyDescriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/assemblyDescriptor_obj.gif
deleted file mode 100644
index 405cae6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/assemblyDescriptor_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attributeKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attributeKey_obj.gif
deleted file mode 100644
index 534b37a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attributeKey_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attribute_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attribute_obj.gif
deleted file mode 100644
index cfb58e4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attribute_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_data_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_data_obj.gif
deleted file mode 100644
index 757f6d9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_data_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_mechanism_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_mechanism_obj.gif
deleted file mode 100644
index 30fdf97..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_mechanism_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_table_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_table_obj.gif
deleted file mode 100644
index 6600367..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_table_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/bmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/bmpEntity_obj.gif
deleted file mode 100644
index 797df13..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/bmpEntity_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpEntity_obj.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpEntity_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_dec.gif
deleted file mode 100644
index 6c66a3d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_dec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_obj.gif
deleted file mode 100644
index 6c66a3d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collaccess_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collaccess_obj.gif
deleted file mode 100644
index 8ac7ca7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collaccess_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collincrement_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collincrement_obj.gif
deleted file mode 100644
index 2aec879..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collincrement_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/config_prop_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/config_prop_obj.gif
deleted file mode 100644
index bc47239..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/config_prop_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connection_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connection_obj.gif
deleted file mode 100644
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connection_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connector_module.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connector_module.gif
deleted file mode 100644
index 522c511..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connector_module.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/copyhelper_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/copyhelper_ovr.gif
deleted file mode 100644
index 4b850e4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/copyhelper_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/create_child.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/create_child.gif
deleted file mode 100644
index eb68f63..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/create_child.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dataclass_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dataclass_ovr.gif
deleted file mode 100644
index cac40a8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dataclass_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/db_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/db_obj.gif
deleted file mode 100644
index 8f2b1d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/db_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dbgroup_obj.gif
deleted file mode 100644
index 40d011d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earBinding_obj.gif
deleted file mode 100644
index 2c1bc41..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earBinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earExtension_obj.gif
deleted file mode 100644
index 07c56bc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earExtension_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earFile_obj.gif
deleted file mode 100644
index 4468d66..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earFile_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_deploy.gif
deleted file mode 100644
index cb0af01..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbBinding_obj.gif
deleted file mode 100644
index c97e6ee..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbBinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbExtension_obj.gif
deleted file mode 100644
index 12184cf..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbExtension_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbJar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbJar_obj.gif
deleted file mode 100644
index f8b5c0a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbJar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbRef_obj.gif
deleted file mode 100644
index 5155069..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbRef_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_container_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_container_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_container_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_local_ref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_local_ref_obj.gif
deleted file mode 100644
index be8a6c1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_local_ref_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_rdbmapping_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_rdbmapping_obj.gif
deleted file mode 100644
index ed3b87b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_rdbmapping_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_reference.gif
deleted file mode 100644
index 5155069..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientjar_obj.gif
deleted file mode 100644
index f1c715e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientutil_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientutil_obj.gif
deleted file mode 100644
index 51db289..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientutil_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_deploy.gif
deleted file mode 100644
index d855812..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbql_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbql_obj.gif
deleted file mode 100644
index 6e92438..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbql_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/environment_entity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/environment_entity.gif
deleted file mode 100644
index bf043f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/environment_entity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/envvar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/envvar_obj.gif
deleted file mode 100644
index bf043f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/envvar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/extwebserviceitemprovider_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/extwebserviceitemprovider_obj.gif
deleted file mode 100644
index f4cc6e3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/extwebserviceitemprovider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/finder_descriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/finder_descriptor_obj.gif
deleted file mode 100644
index 5533c0b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/finder_descriptor_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/foreignKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/foreignKey_obj.gif
deleted file mode 100644
index d261a1d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/foreignKey_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/form_banner.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/group_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/group_obj.gif
deleted file mode 100644
index 2de7edd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/group_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/homeInt_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/homeInt_dec.gif
deleted file mode 100644
index 41f6a7a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/homeInt_dec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/inhrelejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/inhrelejb_obj.gif
deleted file mode 100644
index ed38f23..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/inhrelejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_obj.gif
deleted file mode 100644
index 293a4fa..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readcom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readcom_obj.gif
deleted file mode 100644
index 71bfe63..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readcom_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readuncom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readuncom_obj.gif
deleted file mode 100644
index acfe4db..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readuncom_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_repread_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_repread_obj.gif
deleted file mode 100644
index 9d489cf..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_repread_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_serializ_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_serializ_obj.gif
deleted file mode 100644
index d7db3f2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_serializ_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/jarproject_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/jarproject_deploy.gif
deleted file mode 100644
index 4c54bf1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/jarproject_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/javabean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/javabean_obj.gif
deleted file mode 100644
index c5b260c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/javabean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/keyInt_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/keyInt_dec.gif
deleted file mode 100644
index 03af38b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/keyInt_dec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/license_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/license_obj.gif
deleted file mode 100644
index 50e8dbd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/license_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/listener.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/listener.gif
deleted file mode 100644
index 2320478..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/listener.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febe..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/manyRight_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/manyRight_dec.gif
deleted file mode 100644
index 6edba7b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/manyRight_dec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/message_bean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/message_bean_obj.gif
deleted file mode 100644
index 03e422a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/message_bean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methElement_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methElement_obj.gif
deleted file mode 100644
index c3e27cd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methElement_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methPermission_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methPermission_obj.gif
deleted file mode 100644
index db55cc7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methPermission_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methTransaction_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methTransaction_obj.gif
deleted file mode 100644
index c33f3b2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methTransaction_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methods_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methods_obj.gif
deleted file mode 100644
index 4054a0e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methods_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_clientapp_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_clientapp_obj.gif
deleted file mode 100644
index 0921a8e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_clientapp_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_ejb_obj.gif
deleted file mode 100644
index 1a7cf0e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_group.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_group.gif
deleted file mode 100644
index bb4d9d1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_group.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_web_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_web_obj.gif
deleted file mode 100644
index 7a7b7a3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_web_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/msgdrivendestination_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/msgdrivendestination_obj.gif
deleted file mode 100644
index f5fdccd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/msgdrivendestination_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_read.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_read.gif
deleted file mode 100644
index 2c4d6cd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_read.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_update.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_update.gif
deleted file mode 100644
index ab1d06f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_update.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/parameter_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/parameter_obj.gif
deleted file mode 100644
index b3e0727..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/parameter_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_read.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_read.gif
deleted file mode 100644
index 061aab0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_read.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_update.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_update.gif
deleted file mode 100644
index 996f6ac..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_update.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_active_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_active_obj.gif
deleted file mode 100644
index 7bb71d2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_active_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_inactive_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_inactive_obj.gif
deleted file mode 100644
index ebac134..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_inactive_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_missing_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_missing_obj.gif
deleted file mode 100644
index ff856e1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_missing_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_obj.gif
deleted file mode 100644
index 240d96a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/qname.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/qname.gif
deleted file mode 100644
index 9041598..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/qname.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/query_method_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/query_method_obj.gif
deleted file mode 100644
index 0d04404..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/query_method_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/readaheadhint_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/readaheadhint_obj.gif
deleted file mode 100644
index 3ec2462..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/readaheadhint_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/relationship_role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/relationship_role_obj.gif
deleted file mode 100644
index e422843..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/relationship_role_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remInt_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remInt_dec.gif
deleted file mode 100644
index 44c071e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remInt_dec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remote_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/res_env_ref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/res_env_ref_obj.gif
deleted file mode 100644
index aed2adb..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/res_env_ref_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resourceRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resourceRef_obj.gif
deleted file mode 100644
index f84a67a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resourceRef_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_adapter_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_adapter_obj.gif
deleted file mode 100644
index 959c660..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_adapter_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_reference.gif
deleted file mode 100644
index f84a67a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/roleKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/roleKey_obj.gif
deleted file mode 100644
index 274a850..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/roleKey_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/role_obj.gif
deleted file mode 100644
index b8c76f7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/role_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_binding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_binding_obj.gif
deleted file mode 100644
index 4680b4b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_binding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_map_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_map_obj.gif
deleted file mode 100644
index 4b5374b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_map_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/secur_role_ref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/secur_role_ref_obj.gif
deleted file mode 100644
index 36ae1d9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/secur_role_ref_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_identity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_identity_obj.gif
deleted file mode 100644
index e91320f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_identity_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_permission_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_permission_obj.gif
deleted file mode 100644
index 873fe1a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_permission_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role.gif
deleted file mode 100644
index ad79037..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_obj.gif
deleted file mode 100644
index ad79037..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_reference.gif
deleted file mode 100644
index 0ce458a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrole_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrole_obj.gif
deleted file mode 100644
index a6b251f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrole_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrolebinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrolebinding_obj.gif
deleted file mode 100644
index 227c749..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrolebinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/serverPaused_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/serverPaused_obj.gif
deleted file mode 100644
index dbfcf55..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/serverPaused_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 6146667..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/service_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/session_scope.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/session_scope.gif
deleted file mode 100644
index 9d7b012..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/session_scope.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/showwarn_tsk.gif
deleted file mode 100644
index 14009e9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/showwarn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sql_query_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sql_query_obj.gif
deleted file mode 100644
index 72132b2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sql_query_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/timout_scope.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/timout_scope.gif
deleted file mode 100644
index f1c3b16..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/timout_scope.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/transaction_scope.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/transaction_scope.gif
deleted file mode 100644
index 4465a80..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/transaction_scope.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/undefinedRight_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/undefinedRight_dec.gif
deleted file mode 100644
index a28c716..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/undefinedRight_dec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/user_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/user_obj.gif
deleted file mode 100644
index 90a0014..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/user_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/utiljar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/utiljar_obj.gif
deleted file mode 100644
index ec315d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/utiljar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warBinding_obj.gif
deleted file mode 100644
index cb71fc6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warBinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warExtension_obj.gif
deleted file mode 100644
index 9fe7971..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warExtension_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warFile_obj.gif
deleted file mode 100644
index 067477a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warFile_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServiceItemProvider_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServiceItemProvider_obj.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServiceItemProvider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServicesFolder_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServicesFolder_obj.gif
deleted file mode 100644
index ab3039c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServicesFolder_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/web_library_project_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/web_library_project_obj.gif
deleted file mode 100644
index b268385..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/web_library_project_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_deploy.gif
deleted file mode 100644
index fb242a5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_0_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_0_ovr.gif
deleted file mode 100644
index 3bb995a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_0_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_1_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_1_ovr.gif
deleted file mode 100644
index 4ac7728..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_1_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_2_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_2_ovr.gif
deleted file mode 100644
index f350ae4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_2_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_3_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_3_ovr.gif
deleted file mode 100644
index 0888d56..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_3_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_4_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_4_ovr.gif
deleted file mode 100644
index 02affb1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_4_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_5_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_5_ovr.gif
deleted file mode 100644
index f3f364b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_5_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_0_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_0_ovr.gif
deleted file mode 100644
index 80b105f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_0_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_1_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_1_ovr.gif
deleted file mode 100644
index 6872765..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_1_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_2_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_2_ovr.gif
deleted file mode 100644
index 77a2bd0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_2_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_3_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_3_ovr.gif
deleted file mode 100644
index 7c71488..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_3_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_4_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_4_ovr.gif
deleted file mode 100644
index 39e6f80..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_4_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/caller_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/caller_ovr.gif
deleted file mode 100644
index 552337a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/caller_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/database_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/database_ovr.gif
deleted file mode 100644
index 2ab322d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/database_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejbql_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejbql_ovr.gif
deleted file mode 100644
index 4081d4c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejbql_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c47..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/fullselect_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/fullselect_ovr.gif
deleted file mode 100644
index d1bb3ee..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/fullselect_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/home_interf_ov.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/home_interf_ov.gif
deleted file mode 100644
index 3cbfe78..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/home_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_home_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_home_ovr.gif
deleted file mode 100644
index d782734..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_home_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_ovr.gif
deleted file mode 100644
index 43e1655..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/optimistic_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/optimistic_ovr.gif
deleted file mode 100644
index f7c71fb..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/optimistic_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/remote_interf_ov.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/remote_interf_ov.gif
deleted file mode 100644
index 19c9cae..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/remote_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/securityrole_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/securityrole_ovr.gif
deleted file mode 100644
index 2b61ab3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/securityrole_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_config_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_config_ovr.gif
deleted file mode 100644
index d041bd0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_config_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_inst_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_inst_ovr.gif
deleted file mode 100644
index e8c91ac..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_inst_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_ovr.gif
deleted file mode 100644
index b5e8b3f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/user_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/user_ovr.gif
deleted file mode 100644
index b8797f3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/user_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/whereclause_ovr.GIF b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/whereclause_ovr.GIF
deleted file mode 100644
index 987b661..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/whereclause_ovr.GIF
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/1x_cmpbean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/1x_cmpbean_palette_obj.gif
deleted file mode 100644
index 99e75dd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/1x_cmpbean_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/2x_cmpbean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/2x_cmpbean_palette_obj.gif
deleted file mode 100644
index b81d5ef..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/2x_cmpbean_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/bmpEntity_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/bmpEntity_palette_obj.gif
deleted file mode 100644
index 595d7e8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/bmpEntity_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_rdbmapping_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_rdbmapping_palette_obj.gif
deleted file mode 100644
index d4f0b47..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_rdbmapping_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_reference_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_reference_palette_obj.gif
deleted file mode 100644
index 6052360..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_reference_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/inherelejb_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/inherelejb_palette_obj.gif
deleted file mode 100644
index 8c2ca92..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/inherelejb_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/message_bean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/message_bean_palette_obj.gif
deleted file mode 100644
index 804fabd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/message_bean_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/relationship_role_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/relationship_role_palette_obj.gif
deleted file mode 100644
index ef7a20c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/relationship_role_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/sessionBean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/sessionBean_palette_obj.gif
deleted file mode 100644
index 1400d5e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/sessionBean_palette_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_cmpbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_cmpbean_wiz.gif
deleted file mode 100644
index 5999ae8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_cmpbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejb_wiz.gif
deleted file mode 100644
index a92a7a9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejbjar_wiz.gif
deleted file mode 100644
index 561a70b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/12_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/12_ear_wiz.gif
deleted file mode 100644
index 1cb420f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/12_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/13_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/13_ear_wiz.gif
deleted file mode 100644
index 78fe9f1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/13_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_cmpbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_cmpbean_wiz.gif
deleted file mode 100644
index f239641..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_cmpbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejb_wiz.gif
deleted file mode 100644
index 9735093..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejbjar_wiz.gif
deleted file mode 100644
index f7b2b9d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/Serviceref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/Serviceref_wiz.gif
deleted file mode 100644
index 3d8bca8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/Serviceref_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/access_intent_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/access_intent_wiz.gif
deleted file mode 100644
index 56ed870..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/access_intent_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/accessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/accessbean_wiz.gif
deleted file mode 100644
index c2cfbc7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/accessbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/add_mess_dest_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/add_mess_dest_wiz_ban.gif
deleted file mode 100644
index f9941ce..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/add_mess_dest_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_export_wiz.gif
deleted file mode 100644
index f0ef22a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_export_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_import_wiz.gif
deleted file mode 100644
index e5900ab..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 860fcec..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/attribute_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/attribute_wiz.gif
deleted file mode 100644
index 8a70e59..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/attribute_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/beanselection_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/beanselection_wiz.gif
deleted file mode 100644
index a7e02b9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/beanselection_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/bmp_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/bmp_bean_wiz.gif
deleted file mode 100644
index a07867d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/bmp_bean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/cmp_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/cmp_bean_wiz.gif
deleted file mode 100644
index d709d1c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/cmp_bean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/del_clientview_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/del_clientview_wiz.gif
deleted file mode 100644
index 5a282f7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/del_clientview_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 1a8b127..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earimport_wiz.gif
deleted file mode 100644
index 2b9447f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earpub_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earpub_wiz.gif
deleted file mode 100644
index d93b329..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earpub_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_module_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_module_wiz.gif
deleted file mode 100644
index aab2994..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_module_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_ref_wiz.gif
deleted file mode 100644
index dc55d2a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_ref_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_utility_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_utility_wiz.gif
deleted file mode 100644
index 58f927b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_utility_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_wiz.gif
deleted file mode 100644
index fe5e268..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbbinding_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbbinding_wiz.gif
deleted file mode 100644
index 8dee6c0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbbinding_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbclientjar_wizban.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbclientjar_wizban.gif
deleted file mode 100644
index 231da61..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbclientjar_wizban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbcomposerbanner_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbcomposerbanner_wiz.gif
deleted file mode 100644
index 34324ff..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbcomposerbanner_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexample_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexample_wiz.gif
deleted file mode 100644
index 53bcb2e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexample_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexport_wiz.gif
deleted file mode 100644
index 4ca8448..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbimport_wiz.gif
deleted file mode 100644
index d123519..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbjar_wiz.gif
deleted file mode 100644
index 13941e3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbql_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbql_wiz.gif
deleted file mode 100644
index 0ea27ca..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbql_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbrdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbrdbmapping_wiz.gif
deleted file mode 100644
index d8dbc32..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbrdbmapping_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_ref_wiz.gif
deleted file mode 100644
index e50f828..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_ref_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_variable_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_variable_wiz.gif
deleted file mode 100644
index 2918928..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_variable_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 532a40e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index f56f9e0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index da31168..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index 649eacd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 34418d9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_class_file_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_class_file_wiz_ban.gif
deleted file mode 100644
index 81b1e3f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_class_file_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 9da81ce..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index 786c864..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/inheritance_hierarchy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/inheritance_hierarchy_wiz.gif
deleted file mode 100644
index 305d22e0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/inheritance_hierarchy_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/isolationlevel_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/isolationlevel_wiz.gif
deleted file mode 100644
index 64c5416..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/isolationlevel_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javaprj_to_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javaprj_to_ear_wiz.gif
deleted file mode 100644
index 01e38cc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javaprj_to_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javavisualeditor_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javavisualeditor_wiz.gif
deleted file mode 100644
index 2d51013..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javavisualeditor_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/local_ejb_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/local_ejb_ref_wiz.gif
deleted file mode 100644
index 34f12fa..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/local_ejb_ref_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/message_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/message_bean_wiz.gif
deleted file mode 100644
index ad25134..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/message_bean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/messdestref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/messdestref_wiz.gif
deleted file mode 100644
index b706748..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/messdestref_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_permission_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_permission_wiz.gif
deleted file mode 100644
index caa95c9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_permission_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_transaction_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_transaction_wiz.gif
deleted file mode 100644
index f692e83..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_transaction_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_appclientproject_wiz.gif
deleted file mode 100644
index c4d2fde..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_appclientproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_clientview_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_clientview_wiz.gif
deleted file mode 100644
index e9dc457..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_clientview_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newaccessbean_wiz.gif
deleted file mode 100644
index b32f604..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newaccessbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newappclientprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newappclientprj_wiz.gif
deleted file mode 100644
index cf4f007..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newappclientprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newconnectionprj_wiz.gif
deleted file mode 100644
index 231f8d3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newear_wiz.gif
deleted file mode 100644
index 465f7af..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejb_wiz.gif
deleted file mode 100644
index 8a69ebe..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejb_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbex_wiz.gif
deleted file mode 100644
index 16447fb..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbjar_wiz.gif
deleted file mode 100644
index 79829c2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbprj_wiz.gif
deleted file mode 100644
index b4b8b14..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newfilter_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newfilter_wiz.gif
deleted file mode 100644
index f4b4d08..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newfilter_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newlistener_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newlistener_wiz.gif
deleted file mode 100644
index 1be71d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newlistener_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newservlet_wiz.gif
deleted file mode 100644
index 147e57a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwar_wiz.gif
deleted file mode 100644
index d964e2e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwebex_wiz.gif
deleted file mode 100644
index ff7c242..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwebex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 72944e9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/preload_relationship_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/preload_relationship_wiz.gif
deleted file mode 100644
index f757600..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/preload_relationship_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/regenabn_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/regenabn_wiz.gif
deleted file mode 100644
index b80914e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/regenabn_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/relationship_role_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/relationship_role_wiz.gif
deleted file mode 100644
index 0f48380..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/relationship_role_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/replace_role_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/replace_role_wiz.gif
deleted file mode 100644
index 2dc52d4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/replace_role_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/resource_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/resource_ref_wiz.gif
deleted file mode 100644
index 0d6323e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/resource_ref_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_ref_wiz.gif
deleted file mode 100644
index 4229488..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_ref_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_wiz.gif
deleted file mode 100644
index e05db64..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/security_identity_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/security_identity_wiz.gif
deleted file mode 100644
index ee03172..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/security_identity_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/selectbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/selectbean_wiz.gif
deleted file mode 100644
index 0138451..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/selectbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/session_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/session_bean_wiz.gif
deleted file mode 100644
index dfa3648..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/session_bean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/sql_query_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/sql_query_wiz.gif
deleted file mode 100644
index 0a3ee60..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/sql_query_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/tablemappingstrategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/tablemappingstrategy_wiz.gif
deleted file mode 100644
index fad2d59..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/tablemappingstrategy_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/user_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/user_wiz.gif
deleted file mode 100644
index 7d771ef..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/user_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/usergroup_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/usergroup_wiz.gif
deleted file mode 100644
index 7e3c929..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/usergroup_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index 2d8c047..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warexport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warexport_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warexport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warimport_wiz.gif
deleted file mode 100644
index 0bbebe9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/getstart_a.GIF b/plugins/org.eclipse.jst.j2ee/icons/getstart_a.GIF
deleted file mode 100644
index 6331e65..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/getstart_a.GIF
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee/icons/initializ_parameter.gif
deleted file mode 100644
index b902ea3..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/initializ_parameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readcom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readcom_obj.gif
deleted file mode 100644
index 71bfe63..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readcom_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readuncom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readuncom_obj.gif
deleted file mode 100644
index acfe4db..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readuncom_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_repread_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_repread_obj.gif
deleted file mode 100644
index 9d489cf..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_repread_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_serializ_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_serializ_obj.gif
deleted file mode 100644
index d7db3f2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_serializ_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/jar_nonexist_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/jar_nonexist_obj.gif
deleted file mode 100644
index 0c2ab21..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/jar_nonexist_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/jar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/jar_obj.gif
deleted file mode 100644
index ec315d5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/java_prop.gif b/plugins/org.eclipse.jst.j2ee/icons/java_prop.gif
deleted file mode 100644
index 49873f4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/java_prop.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/key.gif b/plugins/org.eclipse.jst.j2ee/icons/key.gif
deleted file mode 100644
index 03af38b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/key.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/message_bean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/message_bean_obj.gif
deleted file mode 100644
index 03e422a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/message_bean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/methElement_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/methElement_obj.gif
deleted file mode 100644
index c3e27cd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/methElement_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/methPermission_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/methPermission_obj.gif
deleted file mode 100644
index db55cc7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/methPermission_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/methTransaction_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/methTransaction_obj.gif
deleted file mode 100644
index c33f3b2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/methTransaction_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/msgdrivenbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/msgdrivenbean_wiz.gif
deleted file mode 100644
index 30eae50..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/msgdrivenbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/newjprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/newjprj_wiz.gif
deleted file mode 100644
index 6d137cd..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/newjprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/componentscopedref.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/componentscopedref.gif
deleted file mode 100644
index 120b020..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/componentscopedref.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/handler.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/handler.gif
deleted file mode 100644
index 1c8339c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/localencodingmapping_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/localencodingmapping_obj.gif
deleted file mode 100644
index 82555b9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/localencodingmapping_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/messdestref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/messdestref_obj.gif
deleted file mode 100644
index c6830d0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/messdestref_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/portcomponent.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/portcomponent.gif
deleted file mode 100644
index b930e2d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/portcomponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/qname.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/qname.gif
deleted file mode 100644
index 9041598..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/qname.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref.gif
deleted file mode 100644
index 670c5c9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref_obj.gif
deleted file mode 100644
index 2efd1a5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_active_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/primaryKey_active_obj.gif
deleted file mode 100644
index 7bb71d2..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_active_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_inactive_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/primaryKey_inactive_obj.gif
deleted file mode 100644
index ebac134..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_inactive_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/rdaheadhint_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/rdaheadhint_obj.gif
deleted file mode 100644
index 3ec2462..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/rdaheadhint_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/resourceRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/resourceRef_obj.gif
deleted file mode 100644
index f84a67a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/resourceRef_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/role.gif b/plugins/org.eclipse.jst.j2ee/icons/role.gif
deleted file mode 100644
index 6edba7b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/role.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/roleKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/roleKey_obj.gif
deleted file mode 100644
index 274a850..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/roleKey_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/role_obj.gif
deleted file mode 100644
index b8c76f7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/role_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/roleid_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/roleid_obj.gif
deleted file mode 100644
index b683162..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/roleid_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/serverPaused_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/serverPaused_obj.gif
deleted file mode 100644
index dbfcf55..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/serverPaused_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/sessionbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/sessionbean_wiz.gif
deleted file mode 100644
index b9a8d71..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/sessionbean_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/warBinding_obj.gif
deleted file mode 100644
index cb71fc6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warBinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/warExtension_obj.gif
deleted file mode 100644
index 9fe7971..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warExtension_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/warFile_obj.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warFile_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/warn_tsk.gif
deleted file mode 100644
index e2b751d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warning_co.gif b/plugins/org.eclipse.jst.j2ee/icons/warning_co.gif
deleted file mode 100644
index ee2dac4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warning_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/web_application.gif b/plugins/org.eclipse.jst.j2ee/icons/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowDown.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowDown.gif
deleted file mode 100644
index 91e708f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowDown.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowUp.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowUp.gif
deleted file mode 100644
index 9060511..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowUp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/add_column.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/add_column.gif
deleted file mode 100644
index 256e5a0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/add_column.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/connection.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/connection.gif
deleted file mode 100644
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/connection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/convertlinks_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/convertlinks_wiz.gif
deleted file mode 100644
index 3d75cb5..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/convertlinks_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/default.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/default.gif
deleted file mode 100644
index 52bac36..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/default.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportftp_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportftp_wiz.gif
deleted file mode 100644
index fc66e9e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportftp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importftp_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importftp_wiz.gif
deleted file mode 100644
index 400e049..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importftp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importhttp_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importhttp_wiz.gif
deleted file mode 100644
index 4176871..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importhttp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/method.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/method.gif
deleted file mode 100644
index e336513..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/method.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/methodreturn.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/methodreturn.gif
deleted file mode 100644
index 268ae7a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/methodreturn.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebex_wiz.gif
deleted file mode 100644
index 43e86db..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/warFile_obj.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/warFile_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_application.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_application.gif
deleted file mode 100644
index d2a041b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_ovr.gif
deleted file mode 100644
index e0dd2d8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/linksview16/mailto_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/linksview16/mailto_view.gif
deleted file mode 100644
index 23f12fa..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/linksview16/mailto_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/ascii.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/ascii.gif
deleted file mode 100644
index ef30288..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/ascii.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/binary.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/binary.gif
deleted file mode 100644
index 17633ae..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/binary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/environment_entity.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/environment_entity.gif
deleted file mode 100644
index bf043f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/environment_entity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/java_properties.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/java_properties.gif
deleted file mode 100644
index 49873f4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/java_properties.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/method_return.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/method_return.gif
deleted file mode 100644
index d528595..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/method_return.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/projlib_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/projlib_obj.gif
deleted file mode 100644
index 6912def..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/projlib_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/sample16/folder.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/sample16/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/sample16/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFile.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFile.gif
deleted file mode 100644
index ef30288..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFolder.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFolder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFolder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/colourpal_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/colourpal_view.gif
deleted file mode 100644
index 5a04dae..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/colourpal_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/gallery_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/gallery_view.gif
deleted file mode 100644
index 9f779e4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/gallery_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/links_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/links_view.gif
deleted file mode 100644
index 5fd9c94..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/links_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/sample.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/sample.gif
deleted file mode 100644
index bda81f7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/sample.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/thumbnail_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/thumbnail_view.gif
deleted file mode 100644
index ababbca..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/thumbnail_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftpimport_wiz.gif
deleted file mode 100644
index 56c8c3b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftpimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftppub_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftppub_wiz.gif
deleted file mode 100644
index efb2bd4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftppub_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/httpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/httpimport_wiz.gif
deleted file mode 100644
index 71c8182..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/httpimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwebex_wiz.gif
deleted file mode 100644
index ff7c242..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwebex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 72944e9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warexport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warexport_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warexport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warimport_wiz.gif
deleted file mode 100644
index 0bbebe9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejb_obj.gif
deleted file mode 100644
index 445aa37..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejbjar_obj.gif
deleted file mode 100644
index f34adc9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejb_obj.gif
deleted file mode 100644
index 7dbebc4..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejbjar_obj.gif
deleted file mode 100644
index 6b594c9..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/ServletCreateInitParam.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/ServletCreateInitParam.gif
deleted file mode 100644
index e12289b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/ServletCreateInitParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebAppCreateContextParam.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebAppCreateContextParam.gif
deleted file mode 100644
index 8450a6f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebAppCreateContextParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebResourceCollectionCreateURLPatternType.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebResourceCollectionCreateURLPatternType.gif
deleted file mode 100644
index 9f75eb0..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebResourceCollectionCreateURLPatternType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/authority_constraint.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/authority_constraint.gif
deleted file mode 100644
index 5b64c4d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/authority_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/create_child.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/create_child.gif
deleted file mode 100644
index eb68f63..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/create_child.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/error_page.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/error_page.gif
deleted file mode 100644
index 811b21b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/error_page.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/errorcode_errorpage.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/errorcode_errorpage.gif
deleted file mode 100644
index 811b21b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/errorcode_errorpage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/exception_type_errorpage.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/exception_type_errorpage.gif
deleted file mode 100644
index 1845563..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/exception_type_errorpage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter.gif
deleted file mode 100644
index 0712d1e..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter_mapping.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter_mapping.gif
deleted file mode 100644
index 8f2e36b..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/form_login_config.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/form_login_config.gif
deleted file mode 100644
index e3fcbb1..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/form_login_config.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/full/wizban/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/full/wizban/newservlet_wiz.gif
deleted file mode 100644
index 147e57a..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/full/wizban/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/http_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/http_type.gif
deleted file mode 100644
index b26c71d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/http_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter_context.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter_context.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter_context.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_library_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_library_reference.gif
deleted file mode 100644
index 997b50c..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_library_reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_type.gif
deleted file mode 100644
index 8a63675..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/listener.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/listener.gif
deleted file mode 100644
index 2320478..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/listener.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/mime_mapping.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/mime_mapping.gif
deleted file mode 100644
index b647758..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/mime_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_constraint.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_constraint.gif
deleted file mode 100644
index d155408..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_role_nametype.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_role_nametype.gif
deleted file mode 100644
index e91320f..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_role_nametype.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_mapping.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_mapping.gif
deleted file mode 100644
index c495ac8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_type.gif
deleted file mode 100644
index c4a9d21..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/session_config.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/session_config.gif
deleted file mode 100644
index 7b2c1f7..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/session_config.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/url_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/url_type.gif
deleted file mode 100644
index b26c71d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/url_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/user_data_constraint.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/user_data_constraint.gif
deleted file mode 100644
index 25dc9c8..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/user_data_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_application.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_resource_collection.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_resource_collection.gif
deleted file mode 100644
index acba7cb..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_resource_collection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_type.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_12.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_12.gif
deleted file mode 100644
index 7646c44..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_12.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_13.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_13.gif
deleted file mode 100644
index fec24d6..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_13.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_file.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_file.gif
deleted file mode 100644
index d7dab83..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_file.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_list.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_list.gif
deleted file mode 100644
index f4c7132..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_list.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/icons/xml_image.gif b/plugins/org.eclipse.jst.j2ee/icons/xml_image.gif
deleted file mode 100644
index 1496cba..0000000
--- a/plugins/org.eclipse.jst.j2ee/icons/xml_image.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java
deleted file mode 100644
index 1243f3c..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java
+++ /dev/null
@@ -1,237 +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.jst.j2ee.componentcore;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModel;
-import org.eclipse.jst.common.jdt.internal.integration.WorkingCopyManager;
-import org.eclipse.jst.common.jdt.internal.integration.WorkingCopyProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * <p>
- * EnterpriseArtifactEdit obtains a type-specific J2EE metamodel from the managed
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}. The underlying EditModel maintains
- * {@see org.eclipse.emf.ecore.resource.Resource}s, such as the J2EE deployment descriptor
- * resource. The defined methods extract data or manipulate the contents of the underlying resource.
- * </p>
- *
- * <p>
- * This class is an abstract class, and clients are intended to subclass and own their
- * implementation.
- * </p>
- */
-public abstract class EnterpriseArtifactEdit extends ArtifactEdit implements WorkingCopyProvider {
-
- /**
- *
- */
- protected EnterpriseArtifactEdit() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public EnterpriseArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- protected EnterpriseArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate, String projectType) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, projectType);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- * <p>
- * Clients that use this constructor are required to release their access of the EditModel when
- * finished. Calling {@see ArtifactEdit#dispose()}will not touch the supplied EditModel.
- * </p>
- *
- * @param anArtifactEditModel
- * A valid, properly-accessed EditModel
- */
- public EnterpriseArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see WorkbenchComponent}.
- * </p>
- * <p>
- * Instances of EnterpriseArtifactEdit that are returned through this method must be
- * {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature} for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent} pointing to a module from the given
- * {@see ModuleCoreNature}
- */
-
- protected EnterpriseArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from deployment descriptor resource.
- * </p>
- *
- * @return An the J2EE Specification version of the underlying {@see WorkbenchComponent}
- *
- */
- public abstract int getJ2EEVersion();
-
- /**
- * <p>
- * Retrieves a deployment descriptor resource from {@see ArtifactEditModel}using a defined URI.
- * </p>
- *
- * @return The correct deployment descriptor resource for the underlying
- * {@see WorkbenchComponent}
- *
- */
- public abstract Resource getDeploymentDescriptorResource();
-
- /**
- * <p>
- * Obtains the root object from a deployment descriptor resource, the root object contains all
- * other resource defined objects. Examples of a deployment descriptor root include:
- * {@see org.eclipse.jst.j2ee.webapplication.WebApp},
- * {@see org.eclipse.jst.j2ee.application.Application}, and
- * {@see org.eclipse.jst.j2ee.ejb.EJBJar}
- * </p>
- * <p>
- * Subclasses may extend this method to perform their own deployment descriptor creataion/
- * retrieval.
- * </p>
- *
- * @return An EMF metamodel object representing the J2EE deployment descriptor
- *
- */
-
- public EObject getDeploymentDescriptorRoot() {
- Resource res = getDeploymentDescriptorResource();
- return (EObject) res.getContents().get(0);
- }
-
- /**
- * Returns a working copy managet
- *
- * @return
- */
-
- public WorkingCopyManager getWorkingCopyManager() {
-
- return ((JavaArtifactEditModel)getArtifactEditModel()).getWorkingCopyManager();
- }
-
- /**
- * Returns the working copy remembered for the compilation unit.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if there is no
- * remembered working copy for this compilation unit
- */
- public ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
- if (isReadOnly())
- return null;
- return getWorkingCopyManager().getWorkingCopy(cu, forNewCU);
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input. Does not connect the edit model to the working copy.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- public ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws org.eclipse.core.runtime.CoreException {
- return getWorkingCopyManager().getExistingWorkingCopy(cu);
- }
-
- public URI getModuleLocation(String moduleName) {
- if (getProject()!=null)
- return ModuleURIUtil.fullyQualifyURI(getProject());
- return null;
- }
-
- /**
- * This will delete
- *
- * @cu from the workbench and fix the internal references for this working copy manager.
- */
- public void delete(org.eclipse.jdt.core.ICompilationUnit cu, org.eclipse.core.runtime.IProgressMonitor monitor) {
- getWorkingCopyManager().delete(cu, monitor);
- }
-
- /**
- * <p>
- * Create an deployment descriptor resource if one does not get and return it. Subclasses should
- * overwrite this method to create their own type of deployment descriptor
- * </p>
- *
- * @return an EObject
- */
-
- public abstract EObject createModelRoot();
-
- /**
- * <p>
- * Create an deployment descriptor resource if one does not get and return it. Subclasses should
- * overwrite this method to create their own type of deployment descriptor
- * </p>
- *
- * @param int
- * version of the component
- * @return an EObject
- */
-
- public abstract EObject createModelRoot(int version);
-
-
- public Archive asArchive(boolean includeSource) throws OpenFailureException{
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/ClasspathDeleteInfo.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/ClasspathDeleteInfo.java
deleted file mode 100644
index fbb8341..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/ClasspathDeleteInfo.java
+++ /dev/null
@@ -1,76 +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.jst.j2ee.internal.delete;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * A simple structure that remembers for a given project, the manifest entries to be deleted and the
- * build path entries to be deleted
- */
-public class ClasspathDeleteInfo {
- /**
- * The project from which the dependencies will be removed
- */
- protected IProject targetProject;
- /**
- * The literal manifest entries to be removed; String
- */
- protected List manifestEntries;
- /**
- * The project references to be removed from the build path; IProject
- */
- protected List referencedProjects;
-
- public ClasspathDeleteInfo(IProject project) {
- super();
- targetProject = project;
- }
-
- /**
- * Gets the manifestEntries.
- *
- * @return Returns a List
- */
- public List getManifestEntries() {
- if (manifestEntries == null)
- manifestEntries = new ArrayList();
- return manifestEntries;
- }
-
-
- /**
- * Gets the referencedProjects.
- *
- * @return Returns a List
- */
- public List getReferencedProjects() {
- if (referencedProjects == null)
- referencedProjects = new ArrayList();
- return referencedProjects;
- }
-
-
- /**
- * Gets the targetProject.
- *
- * @return Returns a IProject
- */
- public IProject getTargetProject() {
- return targetProject;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java
deleted file mode 100644
index 2a448a5..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java
+++ /dev/null
@@ -1,253 +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.jst.j2ee.internal.delete;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-public class DeleteModuleOperation { //extends WTPOperation {
-
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- // TODO Auto-generated method stub
-
- }
-
-// protected DeleteOptions options;
-// /*
-// * key is an EAREditModel and the value is a list of delete commands. We cache the commands and
-// * execute later because the modules still need to exist when we go to remove module dependency
-// * references.
-// */
-// protected Map deferredCommands;
-// protected IProgressMonitor monitor;
-// protected DeleteModuleDependencyOperation deleteModuleDependencyOperation;
-// protected LooseComposedEditModel deleteEditModel;
-// protected List dirtyEarModels;
-//
-// protected static String EDIT_MODEL_KEY = "DELETE_MODULES"; //$NON-NLS-1$
-//
-// public DeleteModuleOperation(DeleteOptions options) {
-// this.options = options;
-// }
-//
-// /**
-// * @see HeadlessJ2EEOperation#execute(IProgressMonitor)
-// */
-// protected void execute(IProgressMonitor aMonitor) throws CoreException, InvocationTargetException, InterruptedException {
-// this.monitor = aMonitor;
-// try {
-// buildDeleteCommandsIfNecessary();
-// if (options.shouldDeleteModuleDependencies()) {
-// deleteModuleDependencies();
-// }
-// checkIfEarsAreDirty();
-// executeDeferredCommands();
-// saveModelsIfNecessary();
-// } finally {
-// releaseModels();
-// }
-//
-// }
-//
-// protected void checkIfEarsAreDirty() {
-// dirtyEarModels = new ArrayList();
-// if (deferredCommands == null)
-// return;
-// Iterator models = deferredCommands.keySet().iterator();
-// while (models.hasNext()) {
-// EAREditModel model = (EAREditModel) models.next();
-// if (model.isDirty() && !dirtyEarModels.contains(model)) {
-// dirtyEarModels.add(model);
-// }
-// }
-// }
-//
-// protected void buildDeleteCommandsIfNecessary() {
-// if (deferredCommands != null && !deferredCommands.isEmpty())
-// return;
-// deferredCommands = new HashMap();
-// List earProjects = EARNatureRuntime.getAllEARProjectsInWorkbench();
-// for (int i = 0; i < earProjects.size(); i++) {
-// IProject p = (IProject) earProjects.get(i);
-// if (options.getSelectedProjects().contains(p))
-// return;
-// EARNatureRuntime runtime = EARNatureRuntime.getRuntime(p);
-// if (runtime != null)
-// buildDeleteCommands(runtime);
-// }
-// }
-//
-// protected void buildDeleteCommands(EARNatureRuntime runtime) {
-// List commands = new ArrayList();
-// EAREditModel model = runtime.getEarEditModelForWrite(this);
-// List projects = options.getModuleAndUtilityProjects();
-// try {
-// if (options.shouldDeleteModules()) {
-// for (int i = 0; i < projects.size(); i++) {
-// IProject project = (IProject) projects.get(i);
-// Module m = runtime.getModule(project);
-// if (m != null)
-// commands.add(new RemoveModuleFromEARProjectCommand(m, runtime.getProject()));
-// else {
-// String uri = runtime.getJARUri(project);
-// if (uri != null)
-// commands.add(new RemoveUtilityJARMapCommand(runtime.getProject(), uri, project));
-// }
-// }
-// }
-// if (!commands.isEmpty())
-// deferredCommands.put(model, commands);
-// else
-// model.releaseAccess(this);
-// } catch (RuntimeException e) {
-// model.releaseAccess(this);
-// throw e;
-// } catch (Error err) {
-// model.releaseAccess(this);
-// throw err;
-// }
-// }
-//
-// /**
-// * Do this for unhandled exceptions
-// */
-// protected void releaseModels() {
-// if (deleteEditModel != null) {
-// //TODO - RLS, 2/19/2004 we need to revisit the whole notion of the loose composed edit
-// //model beccause this does not release the nested models as expected, also it looks
-// // like
-// // the delete edit model is never created which means validate edit is not happening
-// //TODO - JAS when you look at this class to clean up the above, also look at
-// // RenameModuleOperation
-// //because it has the same kind of mess
-// deleteEditModel.releaseAccess(this);
-// deleteEditModel = null;
-// }
-// if (deferredCommands != null) {
-// Iterator iter = deferredCommands.keySet().iterator();
-// while (iter.hasNext()) {
-// EditModel editModel = (EditModel) iter.next();
-// editModel.releaseAccess(this);
-// iter.remove();
-// }
-// }
-// }
-//
-// public void release() {
-// releaseModels();
-// }
-//
-// /**
-// * After a normal execution flow, save the models if necessary
-// */
-// protected void saveModelsIfNecessary() {
-// if (deferredCommands == null)
-// return;
-// Iterator models = deferredCommands.keySet().iterator();
-// while (models.hasNext()) {
-// EAREditModel model = (EAREditModel) models.next();
-// if (model.isDirty()) {
-// if (dirtyEarModels.contains(model)) {
-// model.saveIfNecessary(this);
-// } else {
-// model.save(this);
-// }
-// }
-// }
-// }
-//
-// protected void deleteModuleDependencies() throws InvocationTargetException, InterruptedException {
-// getDeleteModuleDependencyOperation().run(monitor);
-// }
-//
-// protected DeleteModuleDependencyOperation getDeleteModuleDependencyOperation() {
-// if (deleteModuleDependencyOperation == null) {
-// List earEditModels = new ArrayList();
-// Iterator iter = deferredCommands.keySet().iterator();
-// while (iter.hasNext())
-// earEditModels.add(((EAREditModel) iter.next()).getEARNature());
-// deleteModuleDependencyOperation = new DeleteModuleDependencyOperation(earEditModels, new HashSet(options.getModuleAndUtilityProjects()));
-// }
-// return deleteModuleDependencyOperation;
-// }
-//
-// protected void executeDeferredCommands() {
-// Iterator it = deferredCommands.entrySet().iterator();
-// while (it.hasNext()) {
-// Map.Entry entry = (Map.Entry) it.next();
-// List commands = (List) entry.getValue();
-// executeCommands(commands);
-//
-// }
-// }
-//
-// protected void executeCommands(List commands) {
-// for (int i = 0; i < commands.size(); i++) {
-// Command cmd = (Command) commands.get(i);
-// cmd.execute();
-// }
-// }
-//
-// /**
-// * Return a list of all the non-resource files that will get modified as a result of running
-// * this operation; used for validate edit.
-// */
-// protected List getAffectedNonResourceFiles() {
-// if (options.shouldDeleteModuleDependencies())
-// return getDeleteModuleDependencyOperation().getAffectedFiles();
-// return Collections.EMPTY_LIST;
-// }
-//
-// /**
-// * Use this only for validate edits
-// */
-// public ComposedEditModel getDeleteEditModel() {
-// if (deleteEditModel == null)
-// initializeDeleteEditModel();
-// return deleteEditModel;
-// }
-//
-// protected void initializeDeleteEditModel() {
-// if (options.getAllProjectsToDelete().size() == 0) {
-// throw new RuntimeException(J2EECreationResourceHandler.getString("DeleteModuleOperation_UI_0")); //$NON-NLS-1$
-// }
-//
-// buildDeleteCommandsIfNecessary();
-// IProject project = null;
-// project = (IProject) options.getAllProjectsToDelete().get(0);
-//
-// deleteEditModel = new LooseComposedEditModel(EDIT_MODEL_KEY, (EMFWorkbenchContext) WorkbenchResourceHelper.getEMFContext(project)) {
-//
-// /**
-// * @see org.eclipse.jst.j2ee.internal.internal.workbench.EditModel#getNonResourceFiles()
-// */
-// public List getNonResourceFiles() {
-// List result = super.getNonResourceFiles();
-// result.addAll(getAffectedNonResourceFiles());
-// return result;
-// }
-// };
-//
-// Iterator it = deferredCommands.keySet().iterator();
-// while (it.hasNext()) {
-// deleteEditModel.addChild((J2EEEditModel) it.next());
-// }
-// }
-//
-// public IStatus getStatus() {
-// return deleteModuleDependencyOperation.getStatus();
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteOptions.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteOptions.java
deleted file mode 100644
index a921577..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteOptions.java
+++ /dev/null
@@ -1,126 +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.jst.j2ee.internal.delete;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class DeleteOptions {
-
- protected boolean isEARDelete;
- protected boolean deleteProjects;
- protected boolean deleteModules;
- protected boolean deleteModuleDependencies;
- protected List selectedProjects;
- /** Applicable for EAR delete */
- protected List selectedReferencedProjects;
-
- /**
- * Constructor for DeleteOptions.
- */
- public DeleteOptions() {
- super();
- }
-
-
- public boolean shouldDeleteModules() {
- return deleteModules;
- }
-
-
- public void setDeleteModules(boolean deleteModulesFromAllEARs) {
- this.deleteModules = deleteModulesFromAllEARs;
- }
-
-
- public boolean shouldDeleteProjects() {
- return deleteProjects;
- }
-
-
- public void setDeleteProjects(boolean deleteProjects) {
- this.deleteProjects = deleteProjects;
- }
-
-
- public boolean shouldDeleteModuleDependencies() {
- return deleteModuleDependencies;
- }
-
-
- public void setDeleteModuleDependencies(boolean deleteReferencesFromModuleDependencies) {
- this.deleteModuleDependencies = deleteReferencesFromModuleDependencies;
- }
-
- public List getModuleAndUtilityProjects() {
- if (isEARDelete)
- return getSelectedReferencedProjects();
- return getSelectedProjects();
- }
-
- public List getAllProjectsToDelete() {
- List result = new ArrayList();
- result.addAll(getSelectedProjects());
- result.addAll(getSelectedReferencedProjects());
- return result;
- }
-
- /**
- * Gets the selectedProjects.
- *
- * @return Returns a List
- */
- public List getSelectedProjects() {
- if (selectedProjects == null)
- return Collections.EMPTY_LIST;
- return selectedProjects;
- }
-
- /**
- * Sets the selectedProjects.
- *
- * @param selectedProjects
- * The selectedProjects to set
- */
- public void setSelectedProjects(List selectedProjects) {
- this.selectedProjects = selectedProjects;
- }
-
- /**
- * Gets the selectedReferencedProjects.
- *
- * @return Returns a List
- */
- public List getSelectedReferencedProjects() {
- if (selectedReferencedProjects == null)
- return Collections.EMPTY_LIST;
- return selectedReferencedProjects;
- }
-
- /**
- * Sets the selectedReferencedProjects.
- *
- * @param selectedReferencedProjects
- * The selectedReferencedProjects to set
- */
- public void setSelectedReferencedProjects(List selectedReferencedProjects) {
- this.selectedReferencedProjects = selectedReferencedProjects;
- }
-
- public boolean isEARDelete() {
- return isEARDelete;
- }
-
- public void setIsEARDelete(boolean isEARDelete) {
- this.isEARDelete = isEARDelete;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/Assert.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/Assert.java
deleted file mode 100644
index 265ae9a..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/Assert.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jst.j2ee.internal.project;
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code.
- * The predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (and certainly should not being catching them
- * specifically).
- * </p>
- */
-public final class Assert {
- /* This class is not intended to be instantiated. */
- private Assert() {
- // not allowed
- }
-
- /** Asserts that an argument is legal. If the given boolean is
- * not <code>true</code>, an <code>IllegalArgumentException</code>
- * is thrown.
- *
- * @param expression the outcode of the check
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- * @exception IllegalArgumentException if the legality test failed
- */
- public static boolean isLegal(boolean expression) {
- return isLegal(expression, ""); //$NON-NLS-1$
- }
-
- /** Asserts that an argument is legal. If the given boolean is
- * not <code>true</code>, an <code>IllegalArgumentException</code>
- * is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param expression the outcode of the check
- * @param message the message to include in the exception
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- * @exception IllegalArgumentException if the legality test failed
- */
- public static boolean isLegal(boolean expression, String message) {
- if (!expression)
- throw new IllegalArgumentException(message);
- return expression;
- }
-
- /** Asserts that the given object is not <code>null</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- *
- * @param object the value to test
- * @exception IllegalArgumentException if the object is <code>null</code>
- */
- public static void isNotNull(Object object) {
- isNotNull(object, ""); //$NON-NLS-1$
- }
-
- /** Asserts that the given object is not <code>null</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param object the value to test
- * @param message the message to include in the exception
- * @exception IllegalArgumentException if the object is <code>null</code>
- */
- public static void isNotNull(Object object, String message) {
- if (object == null)
- throw new AssertionFailedException("null argument:" + message); //$NON-NLS-1$
- }
-
- /** Asserts that the given boolean is <code>true</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- *
- * @param expression the outcode of the check
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- */
- public static boolean isTrue(boolean expression) {
- return isTrue(expression, ""); //$NON-NLS-1$
- }
-
- /** Asserts that the given boolean is <code>true</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param expression the outcode of the check
- * @param message the message to include in the exception
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- */
- public static boolean isTrue(boolean expression, String message) {
- if (!expression)
- throw new AssertionFailedException("assertion failed: " + message); //$NON-NLS-1$
- return expression;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/AssertionFailedException.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/AssertionFailedException.java
deleted file mode 100644
index 91c64d9..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/AssertionFailedException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jst.j2ee.internal.project;
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch
- * or otherwise depend on assertion failures are susceptible to unexpected
- * breakage when assertions in the code are added or removed.
- * </p>
- */
-/* package */
-class AssertionFailedException extends RuntimeException {
- /**
- * All serializable objects should have a stable serialVersionUID
- */
- private static final long serialVersionUID = 1L;
-
- /** Constructs a new exception with the given message.
- */
- public AssertionFailedException(String detail) {
- super(detail);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IJ2EEProjectTypes.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IJ2EEProjectTypes.java
deleted file mode 100644
index 684f121..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IJ2EEProjectTypes.java
+++ /dev/null
@@ -1,23 +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.jst.j2ee.internal.project;
-
-
-public interface IJ2EEProjectTypes {
- int SOURCE = 1;
- int BINARY = 2;
- int DEFAULT = 3;
- int UTIL = 4;
- int EJB_CLIENT = 5;
- int MODULE = 6;
- int EJB_MODULE = 7;
- int WEB_MODULE = 8;
- int JCA_MODULE = 9;
- int APPCLIENT_MODULE = 10;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EECreationResourceHandler.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EECreationResourceHandler.java
deleted file mode 100644
index d4ea873..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EECreationResourceHandler.java
+++ /dev/null
@@ -1,161 +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.jst.j2ee.internal.project;
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class J2EECreationResourceHandler extends NLS {
- private static final String BUNDLE_NAME = "j2eecreation";//$NON-NLS-1$
-
- private J2EECreationResourceHandler() {
- // Do not instantiate
- }
-
- public static String EJBReferenceDataModel_UI_12;
- public static String MIGRATE_J2EE_SPEC_UI_;
- public static String EJBReferenceDataModel_UI_11;
- public static String EJBReferenceDataModel_UI_10;
- public static String REQUIRED_CLIENT_VIEW_TITLE;
- public static String MIGRATION_COMPLETE;
- public static String NOT_NEEDED_DEPLOYMENT_DESC_MIG;
- public static String MIGRATION_WARNINGS_REPORT_UI_;
- public static String BACKEND_MIGRATION_FAILED;
- public static String REUSE_DELETED_CLIENT_VIEW_NAME_UI_;
- public static String EJB_PROJECTS_UI_;
- public static String NOT_NEEDED_BACKEND_MIG;
- public static String MIGRATION_NOT_POSSIBLE_REPORT;
- public static String PROJECT_MUST_BE_SELECTED_UI_;
- public static String JAR_11_IMPORT_20_UI_;
- public static String WEBCONTENT_FOLDER_RENAME_SKIPPED;
- public static String CONFIRM_MIGRATE_PROJECT_STRUCTURE;
- public static String WEBPROJECT_VERSION_MIGRATE_FAILED;
- public static String JdkJarFileDoesNotExist_UI;
- public static String Local_cannot_be_empty_UI_;
- public static String LOCAL_CLIENT_NOT_NEEDED;
- public static String REMOTE_CLIENT_VIEWS_NOT_EXIST_UI_;
- public static String MIGRATING_PROJECT_STRUCTURES_UI_;
- public static String ResourceEnvironmentReferenceDataModel_2;
- public static String J2EE_1_2_ONLY_HAVE_REMOTE;
- public static String OPEN_EDITORS_TITLE;
- public static String EJB_MUST_BE_SELECTED_UI_;
- public static String FAILED_MIGRATING_IMPORTED_CLASSES;
- public static String OPEN_J2EE_MIGRATION_WIZARD_UI_;
- public static String LOCAL_CLIENT_VIEWS_EXIST_UI_;
- public static String DELETING_REMOTE_CLIENT_VIEWS_UI_;
- public static String EJB_UI_;
- public static String CONFIRM_CLIENT_VIEW_REQUIRED;
- public static String MIGRATION_NOT_NEEDED;
- public static String ADDING_LOCAL_CLIENT_VIEWS_UI_;
- public static String WEB_UI_;
- public static String DeleteModuleOperation_UI_0;
- public static String Home_cannot_be_empty_UI_;
- public static String WEBCONTENT_LIBPATH_UPDATE_FAILED;
- public static String REMOTE_CLIENT_DELETE_SUCCESS_UI_;
- public static String ServerTargetDataModel_UI_9;
- public static String LOCAL_CLIENT_ADD_FAILED_UI_;
- public static String ServerTargetDataModel_UI_8;
- public static String OLD_PROJECT_STRUCTURE_UI_;
- public static String ServerTargetDataModel_UI_7;
- public static String INFORM_PROPER_SELECTION;
- public static String MIGRATE_MODULE_PROJECTS_UI_;
- public static String COMPLETED_LOCAL_CLIENT_CREATE;
- public static String IMPORTED_CLASSES_FILE_DELETED;
- public static String ADD_LOCAL_CLIENT_VIEWS_BAN_UI_;
- public static String USE_REMOTE_FOR_DIFFERENT_EAR;
- public static String APP_PROJECT_ERROR_EXC_;
- public static String InvalidCharsError;
- public static String ENTERPRISE_APPLICATIONS_UI_;
- public static String ResourceReferenceDataModel_UI_1;
- public static String ResourceReferenceDataModel_UI_0;
- public static String DELETE_REM_CLIENT_VIEWS_UI_;
- public static String Errors_occurred_renaming_module_dependencies_UI_;
- public static String MIGRATION_ERRORS_REPORT_UI_;
- public static String J2EE_VERSION_FAILED_UI_;
- public static String COMPLETED_DEPLOY_DELETE;
- public static String PROJECT_REFERENCES_UPDATED;
- public static String TARGET_ALSO_EXIST_IN_SAME_EAR;
- public static String WEBCONTENT_FOLDER_RENAME_FAILED;
- public static String MIGRATE_UI_;
- public static String Creating__UI_;
- public static String Error_creating_an_EAR_proj_UI_;
- public static String ReferenceDataModel_UI_6;
- public static String ReferenceDataModel_UI_5;
- public static String ReferenceDataModel_UI_3;
- public static String ENTERPRISE_BEANS_BAN_UI_;
- public static String ADD_LOCAL_CLIENT_VIEWS_CHECK_UI_;
- public static String Can_not_rename_module_dependency_from_project_UI_;
- public static String PROJECT_STRUCTURE_SUCCESS_UI_;
- public static String SOURCE_FOLDER_RENAME_SKIPPED;
- public static String UNKNOWN_UI_;
- public static String WIZ_BAN_DESC_UI_;
- public static String COMPLETED_CMP20_CODEGEN;
- public static String PROJECT_NOT_NEED_MIGRATION_UI_;
- public static String SELECT_EJB_CLIENT_VIEWS_UI_;
- public static String Creating_Java_Project_UI_;
- public static String REMOTE_CLIENT_DELETE_FAILED_UI_;
- public static String FILES_OUT_OF_SYNC;
- public static String MIGRATE_CMP_BEANS_UI_;
- public static String Remote_cannot_be_empty_UI_;
- public static String Errors_occurred_deleting_module_dependencies_UI_;
- public static String Can_not_remove_module_dependency_from_project_UI_;
- public static String INVALID_SELECTION_TITLE;
- public static String ABS_PATHS_APP_EXT_REMOVED;
- public static String Local_home_cannot_be_empty_UI_;
- public static String USE_LOCAL_FOR_DIFFERENT_EAR;
- public static String ENTERPRISE_APP_PROJECTS_UI_;
- public static String MIGRATE_J2EE_PROJECTS_UI_;
- public static String MIGRATION_SUCCESS_REPORT_UI_;
- public static String FAILED_DEPLOY_DELETE;
- public static String J2EE_VERSION_NOT_NEED_MIGRATION_UI_;
- public static String MIGRATING_J2EE_VERSION_UI_;
- public static String APPLICATION_CLIENTS_UI_;
- public static String ServiceReferenceDataModel_ERROR_8;
- public static String PROJECT_STRUCTURE_FAILED_UI_;
- public static String LOCAL_CLIENT_ADD_SUCCESS_UI_;
- public static String COMPONENT_ALREADYINEAR;
- public static String COMPLETED_BACKEND_MIG;
- public static String MIGRATE_EJB_SPEC_UI_;
- public static String RenameModuleOperation_UI_0;
- public static String CMP_11_IMPORT_20_UI_;
- public static String J2EE_PROJECT_MIGRATION_TITLE_UI_;
- public static String APP_CLIENT_ONLY_HAVE_REMOTE;
- public static String MIGRATION_NOT_NEEDED_REPORT;
- public static String LOCAL_CLIENT_VIEW_SCHEME_UI_;
- public static String BINARY_MIGRATION_FAILED;
- public static String ENTERPRISE_APPLICATION_UI_;
- public static String INFORM_OPEN_EDITORS;
- public static String EXTRACTED_IMPORTED_CLASSES;
- public static String J2EE_VERSION_SUCCESS_UI_;
- public static String SUFFIX_EXAMPLE_UI_;
- public static String CONFIRMATION_TITLE;
- public static String MIGRATION_ERRORS;
- public static String APPLICATION_CLIENT_UI_;
- public static String SPECIFY_SUFFIX_UI_;
- public static String CONFIRM_MIGRATE_J2EE_13;
- public static String PortComponentReferenceDataModel_ERROR_4;
- public static String FAILED_LOCAL_CLIENT_CREATE;
- public static String MessageDestReferenceDataModel_9;
- public static String APPLICATION_CLIENT_PROJECTS_UI_;
- public static String MessageDestReferenceDataModel_8;
- public static String SOURCE_FOLDER_RENAME_FAILED;
- public static String MessageDestReferenceDataModel_7;
- public static String ENTERPRISE_BEANS_LIST_UI_;
- public static String PROJECT_CLASSPATH_UPDATED;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, J2EECreationResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEJavaProjectInfo.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEJavaProjectInfo.java
deleted file mode 100644
index bdbacdd..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEJavaProjectInfo.java
+++ /dev/null
@@ -1,481 +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.jst.j2ee.internal.project;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.internal.plugin.JavaProjectInfo;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * This class stores the info required for creating a new J2EE project; not all info will apply to
- * all kinds of projects
- */
-public class J2EEJavaProjectInfo extends JavaProjectInfo {
- protected static final String SRCROOT_VAR = "JRE_SRCROOT"; //$NON-NLS-1$
- protected IProject project;
- protected String jdkRTJarPath;
- protected String projectName;
- protected IPath projectLocation;
- protected String javaOutputPath;
- protected IClasspathEntry[] classpathEntries;
- protected boolean shouldInitializeDefaultClasspath = true;
- protected String natureId;
- protected IRuntime serverTarget;
- protected int moduleVersion;
-
- /**
- * EJBProjectInfo constructor comment.
- */
- public J2EEJavaProjectInfo() {
- super();
- }
-
- /**
- * EJBProjectInfo constructor comment.
- */
- public J2EEJavaProjectInfo(IProject project) {
- super();
- setProject(project);
- }
-
- public IClasspathEntry[] calculateServerClasspathEntries() throws JavaModelException {
- IJavaProject javaProject = getJavaProject();
- if (javaProject == null)
- return null;
- if (getProject().exists()) {
- //We don't need to remove a server target anyomre as it need to be there
- //ServerTargetManager.removeServerTarget(getProject(),null);
- IClasspathEntry[] ces = javaProject.getRawClasspath();
- if (ces.length > 0)
- addToClasspathEntries(ces);
- }
- addServerJdkRuntimeToClasspathEntries();
- addServerJarsToClasspathEntries();
- return classpathEntries;
- }
-
- /**
- * Sets up the default classpath for this project
- */
- protected void addDefaultToClasspathEntries() {
- addToClasspathEntries(computeDefaultJavaClasspath());
- }
-
- /**
- * Set the corresponding jsp and servlet levels. Creation date: (11/09/00 10:05:24 AM)
- */
- public void setJ2EEVersion(int newVersion) {
- }
-
-
- /**
- * add the source folder to classpath dir (IClasspathEntry.CPE_SOURCE)
- */
- public void addJavaSourceToClasspathEntries() {
- IPath sourceClassPath = new Path(getFullSourcePath());
- addToClasspathEntries(new IClasspathEntry[]{JavaCore.newSourceEntry(sourceClassPath)});
- }
-
- public boolean addJdkJarToClasspathEntries(String jdkJarFullPathName) {
-
- IJavaProject javaProject = getJavaProject();
- if (javaProject == null)
- return false;
-
- IClasspathEntry[] entry = new IClasspathEntry[1];
- Path path = new Path(jdkJarFullPathName);
- if (!path.toFile().exists()) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(J2EECreationResourceHandler.getString(J2EECreationResourceHandler.JdkJarFileDoesNotExist_UI, new Object[]{jdkJarFullPathName}));
- return false;
- }
-
- entry[0] = JavaCore.newLibraryEntry(path, null, null);
- addToClasspathEntries(entry);
-
- return true;
- }
-
- /**
- * add rt.jar form the server.jdk plugin
- */
- public void addServerJdkRuntimeToClasspathEntries() {
- addToClasspathEntries(getServerJDKClasspathEntries());
- }
-
- public IClasspathEntry[] getServerJDKClasspathEntries() {
- List list = new ArrayList(4);
- //TODO This class should be deleted.
- // if (isJ2EE13()
- // || !org.eclipse.jst.j2ee.internal.internal.plugin.J2EEPlugin.hasDevelopmentRole()) {
- // list.add(JavaCore.newVariableEntry(new
- // Path(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE + "/jre/lib/rt.jar"),
- // //$NON-NLS-1$
- // new Path(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE + "/src.jar"), //$NON-NLS-1$
- // new Path(IEJBNatureConstants.SERVERJDK_SRCROOT_VARIABLE))); //$NON-NLS-1$
- // } else {
- // list.add(JavaCore.newVariableEntry(new
- // Path(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE + "/jre/lib/rt.jar"), //$NON-NLS-1$
- // new Path(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE + "/src.jar"), //$NON-NLS-1$
- // new Path(IEJBNatureConstants.SERVERJDK_SRCROOT_VARIABLE))); //$NON-NLS-1$
- // }
- return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]);
- }
-
- /**
- * Adds entries to the class path for this project
- */
- public void addToClasspathEntries(IClasspathEntry[] entries) {
-
- java.util.List list = new ArrayList(10);
- // add the existing ones if any
- if (classpathEntries != null)
- list.addAll(Arrays.asList(classpathEntries));
-
- // add the new ones
- list.addAll(Arrays.asList(entries));
-
- // convert
- classpathEntries = new IClasspathEntry[list.size()];
- classpathEntries = (IClasspathEntry[]) list.toArray(classpathEntries);
-
- }
-
- public boolean addVariableJarToClasspathEntries(String fullPath) {
-
- IJavaProject javaProject = getJavaProject();
- if (javaProject == null)
- return false;
-
- IClasspathEntry[] entry = new IClasspathEntry[1];
- entry[0] = JavaCore.newVariableEntry(new Path(fullPath), null, null);
- addToClasspathEntries(entry);
- return true;
- }
-
- public boolean addVariableJarToClasspathEntriesWithAttachments(String fullPath, String srcPath, String srcRoot) {
-
- IJavaProject javaProject = getJavaProject();
- if (javaProject == null)
- return false;
-
- IClasspathEntry[] entry = new IClasspathEntry[1];
- entry[0] = JavaCore.newVariableEntry(new Path(fullPath), new Path(srcPath), new Path(srcRoot));
- addToClasspathEntries(entry);
- return true;
- }
-
- /**
- * Return the default classpath for projects of this kind; subclasses should override for
- * setting up new projects
- */
- protected IClasspathEntry[] computeDefaultJavaClasspath() {
- IJavaProject javaProject = getJavaProject();
- if (javaProject == null)
- return null;
- addJavaSourceToClasspathEntries();
- if (serverTarget == null) {
- addServerJdkRuntimeToClasspathEntries();
- addServerJarsToClasspathEntries();
- }
- return classpathEntries;
- }
-
- /**
- * Sublcasses have to overide this method to set the server jars
- */
- public void addServerJarsToClasspathEntries() {
-
- }
-
- /**
- * Creates a project handle with a specified path. The project resource should <b>not </b> be
- * created concretely here;
- */
- public IProject createProjectHandle(IPath projectPath) {
- return getWorkspace().getRoot().getProject(projectPath.segment(0));
- }
-
- public IClasspathEntry[] getClasspathEntries() {
- if (classpathEntries == null)
- initializeClasspathEntries();
- return classpathEntries;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
- *
- * @return java.lang.String
- */
- public java.lang.String getDefaultContextRoot() {
- return null;
- }
-
- /**
- * Subclasses should override as necessary
- */
- protected String getDefaultJavaOutputPath() {
- return DEFAULT_JAVA_OUTPUT_PATH;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
- *
- * @return java.lang.String
- */
- public java.lang.String getDefaultUri() {
- return projectName.replace(' ', '_') + ".jar"; //$NON-NLS-1$
- }
-
- /**
- * Get the java output folder for the receiver, in the form of /project/ <output folder>
- *
- * @return java.lang.String
- */
- public String getFullJavaOutputPath() {
- return Path.ROOT.append(getProjectPath()).append(getJavaOutputPath()).toString();
- }
-
- /**
- * Get the module path folder for the receiver in the form of /project/modulepath
- *
- * @return java.lang.String
- */
- protected String getFullSourcePath() {
- return Path.ROOT.append(getProjectPath()).append(getSourcePath()).toString();
- }
-
- /**
- * Returns the project relative path of the java build destination
- */
- public java.lang.String getJavaOutputPath() {
- if (javaOutputPath == null)
- javaOutputPath = getDefaultJavaOutputPath();
- return javaOutputPath;
- }
-
- /**
- * @param i
- */
- public void setModuleVersion(int version) {
- moduleVersion = version;
- }
-
- public IJavaProject getJavaProject() {
- // needed to get an IJavaProject to create classpaths from.
- IProject aProject = getProject();
- if (aProject == null)
- aProject = getWorkspace().getRoot().getProject(getProjectName());
-
- return JavaCore.create(aProject);
- }
-
- /**
- * Return the absolute path of the default jdk rt.jar to use for this project
- */
- public java.lang.String getJdkRTJarPath() {
- return jdkRTJarPath;
- }
-
- /**
- * Return the project being created; checks the workspace for an existing project
- */
- public IProject getProject() {
- if (project == null) {
- IProject aProject = getWorkspace().getRoot().getProject(getProjectName());
- if (aProject.exists())
- project = aProject;
- }
- return project;
- }
-
- /**
- * Return the location of the project in the file system.
- *
- * @return org.eclipse.core.runtime.IPath
- */
- public IPath getProjectLocation() {
- return projectLocation;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
- *
- * @return java.lang.String
- */
- public java.lang.String getProjectName() {
- if (projectName == null && project != null)
- projectName = project.getName();
- return projectName;
- }
-
- public IPath getProjectPath() {
- return new Path(getProjectName());
- }
-
- public IWorkspace getWorkspace() {
- return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getWorkspace();
- }
-
- /**
- * Lazy initialization - useGetClasspathEntries
- */
- protected void initializeClasspathEntries() {
- if (shouldInitializeDefaultClasspath())
- computeDefaultJavaClasspath();
- else
- classpathEntries = new IClasspathEntry[0];
- }
-
- /**
- * Answer false by default
- *
- * @deprecated - Use getModuleVersion() with J2EEVersionConstants
- */
- protected boolean isJ2EE13() {
- return false;
- }
-
- public IProject primGetProject() {
- return project;
- }
-
- public void removeClasspathEntry(IClasspathEntry entry) {
- if (entry == null)
- return;
-
- List list = new ArrayList(Arrays.asList(getClasspathEntries()));
- list.remove(entry);
- classpathEntries = (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]);
- }
-
- /**
- * Insert the method's description here. Creation date: (11/10/00 10:09:58 AM)
- *
- * @param newClassPathEntries
- * org.eclipse.jdt.core.api.IClasspathEntry
- */
- public void setClasspathEntries(IClasspathEntry[] newClasspathEntries) {
- classpathEntries = newClasspathEntries;
- }
-
- public void setJavaOutputPath(String path) {
- javaOutputPath = path;
- }
-
- public void setJdkRTJarPath(String path) {
- jdkRTJarPath = path;
- }
-
- public void setProject(IProject aProject) {
- project = aProject;
- }
-
- /**
- * Set the location in the file system that the project is to be created.
- *
- * @param newProjectLocation
- * IPath
- */
- public void setProjectLocation(IPath newProjectLocation) {
- projectLocation = newProjectLocation;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
- *
- * @param newProjectName
- * java.lang.String
- */
- public void setProjectName(java.lang.String newProjectName) {
- if (projectName != newProjectName)
- setClasspathEntries(null);
- projectName = newProjectName;
- }
-
- public void setShouldInitializeDefaultClasspath(boolean value) {
- shouldInitializeDefaultClasspath = value;
- }
-
- public boolean shouldInitializeDefaultClasspath() {
- return shouldInitializeDefaultClasspath;
- }
-
- /**
- * Gets the natureId.
- *
- * @return Returns a String
- */
- public String getNatureId() {
- if (natureId == null)
- return getDefaultNatureId();
- return natureId;
- }
-
- /**
- * returns the correct nature id string based on the J2EE spec level being used
- */
- public String getDefaultNatureId() {
- return null;
- }
-
- /**
- * Sets the natureId.
- *
- * @param natureId
- * The natureId to set
- */
- public void setNatureId(String natureId) {
- this.natureId = natureId;
- }
-
- /**
- * Get the correct WAS classpath variable based on the J2EE version.
- */
- protected String getWASPluginVariable() {
- //TODO This class needs to be deleted.
- // if (isJ2EE13()
- // || !org.eclipse.jst.j2ee.internal.internal.plugin.J2EEPlugin.hasDevelopmentRole())
- // return IEJBNatureConstants.WAS_50_PLUGINDIR_VARIABLE;
- // else
- // return IEJBNatureConstants.WAS_PLUGINDIR_VARIABLE;
- return ""; //$NON-NLS-1$
- }
-
- public int getModuleVersion() {
- return moduleVersion;
- }
-
- /**
- * @return
- */
- public IRuntime getServerTarget() {
- return serverTarget;
- }
-
- /**
- * @param target
- */
- public void setServerTarget(IRuntime target) {
- serverTarget = target;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
deleted file mode 100644
index d0eee76..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
+++ /dev/null
@@ -1,798 +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.jst.j2ee.internal.project;
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-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.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationOperation;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-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.IVirtualResource;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-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.IRuntime;
-
-
-
-public class J2EEProjectUtilities extends ProjectUtilities {
-
- public static final String ENTERPRISE_APPLICATION = IModuleConstants.JST_EAR_MODULE;
- public static final String APPLICATION_CLIENT = IModuleConstants.JST_APPCLIENT_MODULE;
- public static final String EJB = IModuleConstants.JST_EJB_MODULE;
- public static final String DYNAMIC_WEB = IModuleConstants.JST_WEB_MODULE;
- public static final String UTILITY = IModuleConstants.JST_UTILITY_MODULE;
- public static final String JCA = IModuleConstants.JST_CONNECTOR_MODULE;
- public static final String STATIC_WEB = IModuleConstants.WST_WEB_MODULE;
-
- /**
- * Return the absolute path of a loose archive in a J2EE application or WAR file
- */
- public static IPath getRuntimeLocation(IProject aProject) {
- if (JemProjectUtilities.isBinaryProject(aProject))
- return getBinaryProjectJARLocation(aProject);
- return JemProjectUtilities.getJavaProjectOutputAbsoluteLocation(aProject);
- }
-
- public static IPath getBinaryProjectJARLocation(IProject aProject) {
- List sources = JemProjectUtilities.getLocalJARPathsFromClasspath(aProject);
- if (!sources.isEmpty()) {
- IPath path = (IPath) sources.get(0);
- return aProject.getFile(path).getLocation();
- }
- return null;
- }
-
- public static Archive getClientJAR(EJBJarFile file, EARFile earFile) {
- EJBJar jar = file.getDeploymentDescriptor();
- if (jar == null)
- return null;
- String clientJAR = jar.getEjbClientJar();
- if (clientJAR == null || clientJAR.length() == 0)
- return null;
- String normalized = ArchiveUtil.deriveEARRelativeURI(clientJAR, file.getURI());
- if (normalized != null) {
- try {
- File aFile = earFile.getFile(normalized);
- if (aFile.isArchive() && !aFile.isModuleFile())
- return (Archive) aFile;
- } catch (FileNotFoundException nothingThere) {
- }
- }
- return null;
- // TODO - release the DD here to free up space
- }
-
- /**
- * Append one IClasspathEntry to the build path of the passed project. If a classpath entry
- * having the same path as the parameter already exists, then does nothing.
- */
- public static void appendJavaClassPath(IProject p, IClasspathEntry newEntry) throws JavaModelException {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(p);
- if (javaProject == null)
- return;
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- List newPathList = new ArrayList(classpath.length);
- for (int i = 0; i < classpath.length; i++) {
- IClasspathEntry entry = classpath[i];
- // fix dup class path entry for .JETEmitter project
- // Skip the entry to be added if it already exists
- if (Platform.getOS().equals(Platform.OS_WIN32)) {
- if (!entry.getPath().toString().equalsIgnoreCase(newEntry.getPath().toString()))
- newPathList.add(entry);
- else
- return;
- } else {
- if (!entry.getPath().equals(newEntry.getPath()))
- newPathList.add(entry);
- else
- return;
- }
- }
- newPathList.add(newEntry);
- IClasspathEntry[] newClasspath = (IClasspathEntry[]) newPathList.toArray(new IClasspathEntry[newPathList.size()]);
- javaProject.setRawClasspath(newClasspath, new NullProgressMonitor());
- }
-
-
- public static Archive asArchiveFromBinary(String jarUri, IProject aProject) throws OpenFailureException {
- IPath path = getBinaryProjectJARLocation(aProject);
- if (path != null) {
- String location = path.toOSString();
- Archive anArchive = CommonarchiveFactoryImpl.getActiveFactory().primOpenArchive(location);
- anArchive.setURI(jarUri);
- return anArchive;
- }
- return null;
- }
-
- public static ArchiveManifest readManifest(IFile aFile) {
- InputStream in = null;
- try {
- if (aFile == null || !aFile.exists())
- return null;
- in = aFile.getContents();
- return new ArchiveManifestImpl(in);
- } catch (Exception ex) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- return null;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- }
- }
- }
- }
-
- public static ArchiveManifest readManifest(IProject p) {
- InputStream in = null;
- try {
- IFile aFile = getManifestFile(p);
- if (aFile == null || !aFile.exists())
- return null;
- in = aFile.getContents();
- return new ArchiveManifestImpl(in);
- } catch (Exception ex) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- return null;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- }
- }
- }
- }
-
- public static IFile getManifestFile(IProject p) {
- IVirtualComponent component = ComponentCore.createComponent(p);
- try {
- return ComponentUtilities.findFile(component, new Path(J2EEConstants.MANIFEST_URI));
- } catch (CoreException ce) {
- Logger.getLogger().log(ce);
- }
- return null;
- }
-
- public static void writeManifest(IProject p, ArchiveManifest manifest) throws java.io.IOException {
-
- IFile aFile = getManifestFile(p);
- if (aFile != null) {
- OutputStream out = new WorkbenchByteArrayOutputStream(aFile);
- manifest.writeSplittingClasspath(out);
- out.close();
- }
- }
-
- public static void writeManifest(IFile aFile, ArchiveManifest manifest) throws java.io.IOException {
- if (aFile != null) {
- OutputStream out = new WorkbenchByteArrayOutputStream(aFile);
- manifest.writeSplittingClasspath(out);
- out.close();
- }
- }
-
- /**
- * Keys are the EJB JAR files and the values are the respective client JARs; includes only key
- * value pairs for which EJB Client JARs are defined and exist.
- *
- * @author schacher
- */
- public static Map collectEJBClientJARs(EARFile earFile) {
- if (earFile == null)
- return Collections.EMPTY_MAP;
- Map ejbClientJARs = null;
- List ejbJARFiles = earFile.getEJBJarFiles();
- Archive clientJAR = null;
- for (int i = 0; i < ejbJARFiles.size(); i++) {
- EJBJarFile ejbJarFile = (EJBJarFile) ejbJARFiles.get(i);
- clientJAR = getClientJAR(ejbJarFile, earFile);
- if (clientJAR != null) {
- if (ejbClientJARs == null)
- ejbClientJARs = new HashMap();
- ejbClientJARs.put(ejbJarFile, clientJAR);
- }
- }
- return ejbClientJARs == null ? Collections.EMPTY_MAP : ejbClientJARs;
- }
-
- public static String computeRelativeText(String referencingURI, String referencedURI, EnterpriseBean bean) {
- if (bean == null)
- return null;
-
- String beanName = bean.getName();
- if (beanName == null)
- return null;
-
- String relativeUri = computeRelativeText(referencingURI, referencedURI);
- if (relativeUri == null)
- return beanName;
- return relativeUri + "#" + beanName; //$NON-NLS-1$
- }
-
- public static String computeRelativeText(String referencingURI, String referencedURI) {
- if (referencingURI == null || referencedURI == null)
- return null;
- IPath pPre = new Path(referencingURI);
- IPath pDep = new Path(referencedURI);
- if (pPre.getDevice() != null || pDep.getDevice() != null)
- return null;
- pPre = pPre.makeRelative();
- pDep = pDep.makeRelative(); // referenced Archive path URI
-
- while (pPre.segmentCount() > 1 && pDep.segmentCount() > 1 && pPre.segment(0).equals(pDep.segment(0))) {
- pPre = pPre.removeFirstSegments(1);
- pDep = pDep.removeFirstSegments(1);
- }
-
- IPath result = null;
- StringBuffer buf = new StringBuffer();
- String segment = null;
- do {
- segment = pDep.lastSegment();
- pPre = pPre.removeLastSegments(1);
- pDep = pDep.removeLastSegments(1);
- if (segment != null) {
- if (result == null)
- result = new Path(segment);
- else
- result = new Path(segment).append(result);
- }
- if (!pPre.equals(pDep) && !pPre.isEmpty())
- buf.append("../"); //$NON-NLS-1$
- } while (!pPre.equals(pDep));
-
- if (result != null)
- buf.append(result.makeRelative().toString());
-
- return buf.toString();
- }
-
- public static IProject getEJBProjectFromEJBClientProject(IProject ejbClientProject) {
- try {
- if (null != ejbClientProject && ejbClientProject.hasNature(JavaCore.NATURE_ID)) {
- IProject[] allProjects = getAllProjects();
- for (int i = 0; i < allProjects.length; i++) {
- if (null != EarModuleManager.getEJBModuleExtension().getEJBJar(allProjects[i])) {
- if (ejbClientProject == EarModuleManager.getEJBModuleExtension().getDefinedEJBClientJARProject(allProjects[i])) {
- return allProjects[i];
- }
- }
- }
- }
- } catch (CoreException e) {
- }
- return null;
- }
-
- public static EnterpriseBean getEnterpriseBean(ICompilationUnit cu) {
- IProject proj = cu.getJavaProject().getProject();
- EJBJar jar = EarModuleManager.getEJBModuleExtension().getEJBJar(proj);
- if (null == jar) {
- jar = EarModuleManager.getEJBModuleExtension().getEJBJar(getEJBProjectFromEJBClientProject(proj));
- }
- if (jar != null) {
- int index = cu.getElementName().indexOf('.');
- String className = cu.getElementName();
- if (index > 0)
- className = className.substring(0, index);
- JavaClass javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(cu.getParent().getElementName(), className, jar.eResource().getResourceSet());
- return jar.getEnterpriseBeanWithReference(javaClass);
- }
- return null;
- }
-
- public static IContainer getSourceFolderOrFirst(IProject p, String defaultSourceName) {
- try {
- IPath sourcePath = getSourcePathOrFirst(p, defaultSourceName);
- if (sourcePath == null)
- return null;
- else if (sourcePath.isEmpty())
- return p;
- else
- return p.getFolder(sourcePath);
- } catch (IllegalArgumentException ex) {
- return null;
- }
- }
- public static void removeBuilders(IProject project,List builderids) throws CoreException {
- IProjectDescription desc = project.getDescription();
- ICommand[] oldSpec = desc.getBuildSpec();
- int oldLength = oldSpec.length;
- if (oldLength == 0)
- return;
- int remaining = 0;
- //null out all commands that match the builder to remove
- for (int i = 0; i < oldSpec.length; i++) {
- if (builderids.contains(oldSpec[i].getBuilderName()))
- oldSpec[i] = null;
- else
- remaining++;
- }
- //check if any were actually removed
- if (remaining == oldSpec.length)
- return;
- ICommand[] newSpec = new ICommand[remaining];
- for (int i = 0, newIndex = 0; i < oldLength; i++) {
- if (oldSpec[i] != null)
- newSpec[newIndex++] = oldSpec[i];
- }
- desc.setBuildSpec(newSpec);
- project.setDescription(desc, IResource.NONE, null);
- }
-
- public static IPath getSourcePathOrFirst(IProject p, String defaultSourceName) {
- IJavaProject javaProj = JemProjectUtilities.getJavaProject(p);
- if (javaProj == null)
- return null;
- IClasspathEntry[] cp = null;
- try {
- cp = javaProj.getRawClasspath();
- } catch (JavaModelException ex) {
- JEMUtilPlugin.getLogger().logError(ex);
- return null;
- }
- IClasspathEntry firstSource = null;
- IPath defaultSourcePath = null;
- if (defaultSourceName != null)
- defaultSourcePath = createPath(p, defaultSourceName);
- boolean found = false;
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- // check if it contains /META-INF/MANIFEST.MF
- IPath sourceFolderPath = cp[i].getPath().removeFirstSegments(1);
- IFolder sourceFolder = p.getFolder(sourceFolderPath);
- if (isSourceFolderAnInputContainer(sourceFolder)) {
- found = true;
- if (firstSource == null) {
- firstSource = cp[i];
- if (defaultSourcePath == null)
- break;
- }
- if (cp[i].getPath().equals(defaultSourcePath))
- return defaultSourcePath.removeFirstSegments(1);
- }
- }
- }
- if (!found) {
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- if (firstSource == null) {
- firstSource = cp[i];
- if (defaultSourcePath == null)
- break;
- }
- if (cp[i].getPath().equals(defaultSourcePath))
- return defaultSourcePath.removeFirstSegments(1);
- }
- }
- }
- if (firstSource == null)
- return null;
- if (firstSource.getPath().segment(0).equals(p.getName()))
- return firstSource.getPath().removeFirstSegments(1);
- return null;
- }
-
- public static boolean isSourceFolderAnInputContainer(IFolder sourceFolder) {
- IContainer parent = sourceFolder;
- while (true) {
- parent = parent.getParent();
- if (parent == null)
- return false;
- if (parent instanceof IProject)
- break;
- }
- IProject project = (IProject) parent;
- try {
- if (!project.isAccessible())
- return false;
- if (isEJBProject(project)) {
- return sourceFolder.findMember(J2EEConstants.EJBJAR_DD_URI) != null;
- } else if (isApplicationClientProject(project)) {
- return sourceFolder.findMember(J2EEConstants.APP_CLIENT_DD_URI) != null;
- } else if (isDynamicWebProject(project)) {
- return sourceFolder.findMember(J2EEConstants.WEBAPP_DD_URI) != null;
- } else if (isJCAProject(project)) {
- return sourceFolder.findMember(J2EEConstants.RAR_DD_URI) != null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- public static Archive asArchive(String jarUri, IProject project, boolean exportSource) throws OpenFailureException {
- JavaComponentLoadStrategyImpl strat = new JavaComponentLoadStrategyImpl(ComponentCore.createComponent(project));
- strat.setExportSource(exportSource);
- return CommonarchiveFactoryImpl.getActiveFactory().primOpenArchive(strat, jarUri);
- }
-
- public 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;
- }
- private static boolean isProjectOfType(IFacetedProject facetedProject, String typeID) {
-
- if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
- }
- return false;
- }
-
- private static boolean isEARProject(IFacetedProject project) {
- return isProjectOfType(project, ENTERPRISE_APPLICATION);
- }
-
- private static boolean isDynamicWebProject(IFacetedProject project) {
- return isProjectOfType(project, DYNAMIC_WEB);
- }
-
- private static boolean isStaticWebProject(IFacetedProject project) {
- return isProjectOfType(project, STATIC_WEB);
- }
-
- private static boolean isEJBProject(IFacetedProject project) {
- return isProjectOfType(project, EJB);
- }
-
- private static boolean isJCAProject(IFacetedProject project) {
- return isProjectOfType(project, JCA);
- }
-
- private static boolean isApplicationClientProject(IFacetedProject project) {
- return isProjectOfType(project, APPLICATION_CLIENT);
- }
-
- private static boolean isUtilityProject(IFacetedProject project) {
- return isProjectOfType(project, UTILITY);
- }
- public static boolean isEARProject(IProject project) {
- return isProjectOfType(project, ENTERPRISE_APPLICATION);
- }
-
- public static boolean isDynamicWebProject(IProject project) {
- return isProjectOfType(project, DYNAMIC_WEB);
- }
-
- public static boolean isStaticWebProject(IProject project) {
- return isProjectOfType(project, STATIC_WEB);
- }
-
- public static boolean isEJBProject(IProject project) {
- return isProjectOfType(project, EJB);
- }
-
- public static boolean isJCAProject(IProject project) {
- return isProjectOfType(project, JCA);
- }
-
- public static boolean isApplicationClientProject(IProject project) {
- return isProjectOfType(project, APPLICATION_CLIENT);
- }
-
- public static boolean isUtilityProject(IProject project) {
- return isProjectOfType(project, UTILITY);
- }
-
- public static boolean isStandaloneProject(IProject project) {
- return getReferencingEARProjects(project).length==0;
- }
-
- public static IProject[] getReferencingEARProjects(IProject project) {
- List result = new ArrayList();
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null) {
- IVirtualComponent[] refComponents = component.getReferencingComponents();
- for (int i=0; i<refComponents.length; i++) {
- if (isEARProject(refComponents[i].getProject()))
- result.add(refComponents[i].getProject());
- }
- }
- return (IProject[]) result.toArray(new IProject[result.size()]);
- }
-
- /**
- * Return all projects in workspace of the specified type
- * @param type - use one of the static strings on this class as a type
- * @return IProject[]
- */
- public static IProject[] getAllProjectsInWorkspaceOfType(String type) {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- List result = new ArrayList();
- for (int i = 0; i < projects.length; i++) {
- if (isProjectOfType(projects[i],type))
- result.add(projects[i]);
- }
- return (IProject[]) result.toArray(new IProject[result.size()]);
- }
-
- public static String getJ2EEProjectType(IProject project) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return ""; //$NON-NLS-1$
- }
- if (isApplicationClientProject(facetedProject))
- return APPLICATION_CLIENT;
- else if (isDynamicWebProject(facetedProject))
- return DYNAMIC_WEB;
- else if (isEJBProject(facetedProject))
- return EJB;
- else if (isEARProject(facetedProject))
- return ENTERPRISE_APPLICATION;
- else if (isJCAProject(facetedProject))
- return JCA;
- else if (isStaticWebProject(facetedProject))
- return STATIC_WEB;
- else if (isUtilityProject(facetedProject))
- return UTILITY;
- else
- return ""; //$NON-NLS-1$
- }
-
- public static IRuntime getServerRuntime(IProject project) throws CoreException {
- if (project == null)
- return null;
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject == null)
- return null;
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = facetedProject.getRuntime();
- if (runtime == null)
- return null;
- return FacetUtil.getRuntime(runtime);
- }
-
- public static String getJ2EEProjectVersion(IProject project) {
- String type = getJ2EEProjectType(project);
- IFacetedProject facetedProject = null;
- IProjectFacet facet = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- facet = ProjectFacetsManager.getProjectFacet(type);
- } catch (Exception e) {
- // Not Faceted project or not J2EE Project
- }
- if (facet != null && facetedProject.hasProjectFacet(facet))
- return facetedProject.getInstalledVersion(facet).getVersionString();
- return null;
- }
- public static JavaProjectMigrationOperation createFlexJavaProjectForProjectOperation(IProject project) {
- IDataModel model = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
- model.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, project.getName());
- return new JavaProjectMigrationOperation(model);
- }
-
- /**
- * Retrieve all the source containers for a given virtual workbench component
- *
- * @param vc
- * @return the array of IPackageFragmentRoots
- */
- public static IPackageFragmentRoot[] getSourceContainers(IProject project) {
- IJavaProject jProject = JemProjectUtilities.getJavaProject(project);
- if (jProject == null)
- return new IPackageFragmentRoot[0];
- List list = new ArrayList();
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IPackageFragmentRoot[] roots;
- try {
- roots = jProject.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].getKind() != IPackageFragmentRoot.K_SOURCE)
- continue;
- IResource resource = roots[i].getResource();
- if (null != resource) {
- IVirtualResource[] vResources = ComponentCore.createResources(resource);
- boolean found = false;
- for (int j = 0; !found && j < vResources.length; j++) {
- if (vResources[j].getComponent().equals(vc)) {
- if (!list.contains(roots[i]))
- list.add(roots[i]);
- found = true;
- }
- }
- }
- }
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- return (IPackageFragmentRoot[]) list.toArray(new IPackageFragmentRoot[list.size()]);
- }
-
- /**
- * Retrieve all the output containers for a given virtual component.
- *
- * @param vc
- * @return array of IContainers for the output folders
- */
- public static IContainer[] getOutputContainers(IProject project) {
- List result = new ArrayList();
- try {
- if (!project.hasNature(JavaCore.NATURE_ID))
- return new IContainer[]{};
- }
- catch (Exception e) {}
- IPackageFragmentRoot[] sourceContainers = getSourceContainers(project);
- for (int i=0; i<sourceContainers.length; i++) {
- IContainer outputFolder = getOutputContainer(project,sourceContainers[i]);
- if (outputFolder != null && !result.contains(outputFolder))
- result.add(outputFolder);
- }
- return (IContainer[]) result.toArray(new IContainer[result.size()]);
- }
-
- public static IContainer getOutputContainer(IProject project, IPackageFragmentRoot sourceContainer) {
- try {
- IJavaProject jProject = JavaCore.create(project);
- IPath outputPath = sourceContainer.getRawClasspathEntry().getOutputLocation();
- if (outputPath == null) {
- if (jProject.getOutputLocation().segmentCount()==1)
- return project;
- return project.getFolder(jProject.getOutputLocation().removeFirstSegments(1));
- }
- return project.getFolder(outputPath.removeFirstSegments(1));
- } catch (Exception e) {}
- return null;
- }
-
- /**
- *
- * @param name
- * @return
- * @description the passed name should have either lib or var as its first segment e.g.
- * lib/D:/foo/foo.jar or var/<CLASSPATHVAR>/foo.jar
- */
- public static IPath getResolvedPathForArchiveComponent(String name) {
-
- URI uri = URI.createURI(name);
-
- String resourceType = uri.segment(0);
- URI contenturi = ModuleURIUtil.trimToRelativePath(uri, 1);
- String contentName = contenturi.toString();
-
- if (resourceType.equals("lib")) { //$NON-NLS-1$
- // module:/classpath/lib/D:/foo/foo.jar
- return Path.fromOSString(contentName);
-
- } else if (resourceType.equals("var")) { //$NON-NLS-1$
-
- // module:/classpath/var/<CLASSPATHVAR>/foo.jar
- String classpathVar = contenturi.segment(0);
- URI remainingPathuri = ModuleURIUtil.trimToRelativePath(contenturi, 1);
- String remainingPath = remainingPathuri.toString();
-
- String[] classpathvars = JavaCore.getClasspathVariableNames();
- boolean found = false;
- for (int i = 0; i < classpathvars.length; i++) {
- if (classpathVar.equals(classpathvars[i])) {
- found = true;
- break;
- }
- }
- if (found) {
- IPath path = JavaCore.getClasspathVariable(classpathVar);
- URI finaluri = URI.createURI(path.toOSString() + IPath.SEPARATOR + remainingPath);
- return Path.fromOSString(finaluri.toString());
- }
- }
- return null;
- }
-
- public static List getAllJavaNonFlexProjects() throws CoreException {
- List nonFlexJavaProjects = new ArrayList();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- if (projects[i].isAccessible() && projects[i].hasNature(JavaCore.NATURE_ID) && !projects[i].hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- nonFlexJavaProjects.add(projects[i]);
- }
- }
- return nonFlexJavaProjects;
- }
-
- /**
- * This method will retrieve the context root for the associated workbench module which is used
- * by the server at runtime. This method is not yet completed as the context root has to be
- * abstracted and added to the workbenchModule model. This API will not change though.
- * Returns null for now.
- *
- * @return String value of the context root for runtime of the associated module
- */
- public static String getServerContextRoot(IProject project) {
- return ComponentUtilities.getServerContextRoot(project);
- }
-
- /**
- * This method will set the context root on the associated workbench module with the given string
- * value passed in. This context root is used by the server at runtime. This method is not yet
- * completed as the context root still needs to be abstracted and added to the workbench module
- * model. This API will not change though.
- * Does nothing as of now.
- *
- * @param contextRoot string
- */
- public static void setServerContextRoot(IProject project, String contextRoot) {
- ComponentUtilities.setServerContextRoot(project,contextRoot);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ManifestFileCreationAction.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ManifestFileCreationAction.java
deleted file mode 100644
index 78e2cdd..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ManifestFileCreationAction.java
+++ /dev/null
@@ -1,41 +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.jst.j2ee.internal.project;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-
-public class ManifestFileCreationAction {
-
- public static final String MANIFEST_HEADER = "Manifest-Version: 1.0\r\nClass-Path: \r\n\r\n"; //$NON-NLS-1$
-
- /**
- * Constructor for ManifestFileCreationAction.
- */
- public ManifestFileCreationAction() {
- super();
- }
-
- public static void createManifestFile(IFile file, IProject aJ2EEProject) throws CoreException, IOException {
- try {
- WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(file);
- out.write(MANIFEST_HEADER.getBytes());
- out.close();
-
- } catch (IOException ioe) {
- throw ioe;
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ProjectSupportResourceHandler.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ProjectSupportResourceHandler.java
deleted file mode 100644
index af7e182..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ProjectSupportResourceHandler.java
+++ /dev/null
@@ -1,60 +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.jst.j2ee.internal.project;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ProjectSupportResourceHandler extends NLS {
- private static final String BUNDLE_NAME = "projectsupport";//$NON-NLS-1$
-
- private ProjectSupportResourceHandler() {
- // Do not instantiate
- }
-
- public static String Folder_name_cannot_be_the_same_as_Java_source_folder_5;
- public static String Target_Update_Op;
- public static String Operation_failed_due_to_SA_ERROR_;
- public static String Creating_Web_Project____UI_;
- public static String Could_not_rename_____2;
- public static String A_web_project_must_be_open_and_must_exist_for_properties_to_be_edited_30;
- public static String Operation_failed_due_to_IO_ERROR_;
- public static String Cannot_clone_TaglibInfo_1_EXC_;
- public static String Syntax_Error_in_the_links_UI_;
- public static String Sync_WLP_Op;
- public static String Generated_by_Web_Tooling_23;
- public static String _1concat_EXC_;
- public static String File_Serving_Enabler_7;
- public static String Auto_Generated___File_Enabler_9;
- public static String Not_a_web_project_29;
- public static String Names_cannot_begin_or_end_with_whitespace_5;
- public static String The_character_is_invalid_in_a_context_root;
- public static String Folder_name_cannot_be_the_same_as_Java_class_folder_6;
- public static String The_path_for_the_links_sta_EXC_;
- public static String Operation_failed_due_to_Ja_ERROR_;
- public static String Folder_name_cannot_be_empty_2;
- public static String Error_importing_Module_Fil_EXC_;
- public static String Operation_failed_due_to_Co_ERROR_;
- public static String Folder_names_cannot_be_equal_4;
- public static String Could_not_read_TLD_15;
- public static String Folder_name_is_not_valid;
- public static String Invalid_Servlet_Level_set_on_WebNature_3_EXC_;
- public static String Context_Root_cannot_be_empty_2;
- public static String Error_while_saving_links_s_EXC_;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ProjectSupportResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java
deleted file mode 100644
index 7ca6c0a..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java
+++ /dev/null
@@ -1,581 +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
- *******************************************************************************/
-/*
- * Created on Mar 17, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.project;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-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.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.codegen.CodeGenPlugin;
-import org.eclipse.emf.codegen.jet.JETCompiler;
-import org.eclipse.emf.codegen.jet.JETEmitter;
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.osgi.util.ManifestElement;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-
-/**
- * @author schacher, mdelder
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WTPJETEmitter extends JETEmitter {
-
- public static final String PROJECT_NAME = ".JETEmitters"; //$NON-NLS-1$
- private Map variables;
-
- private boolean intelligentLinkingEnabled = false;
-
- private JETCompiler jetCompiler;
-
- /**
- * @param templateURI
- */
- public WTPJETEmitter(String templateURI) {
- super(templateURI);
- }
-
- /**
- * @param templateURIPath
- * @param relativeTemplateURI
- */
- public WTPJETEmitter(String[] templateURIPath, String relativeTemplateURI) {
- super(templateURIPath, relativeTemplateURI);
- }
-
- /**
- * @param templateURI
- * @param classLoader
- */
- public WTPJETEmitter(String templateURI, ClassLoader classLoader) {
- super(templateURI, classLoader);
- }
-
- /**
- * @param templateURIPath
- * @param relativeTemplateURI
- * @param classLoader
- */
- public WTPJETEmitter(String[] templateURIPath, String relativeTemplateURI, ClassLoader classLoader) {
- super(templateURIPath, relativeTemplateURI, classLoader);
- }
-
- /**
- * @param templateURIPath
- * @param relativeTemplateURI
- * @param classLoader
- * @param encoding
- */
- public WTPJETEmitter(String[] templateURIPath, String relativeTemplateURI, ClassLoader classLoader, String encoding) {
- super(templateURIPath, relativeTemplateURI, classLoader, encoding);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.codegen.jet.JETEmitter#initialize(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void initialize(IProgressMonitor progressMonitor) throws JETException {
-
- progressMonitor.beginTask("", 10); //$NON-NLS-1$
- progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_GeneratingJETEmitterFor_message", new Object[]{templateURI})); //$NON-NLS-1$
-
- try {
- // This ensures that the JRE variables are initialized.
- try {
- JavaRuntime.getDefaultVMInstall();
- } catch (Throwable throwable) {
- // This is kind of nasty to come here.
- URL jreURL = Platform.find(Platform.getBundle("org.eclipse.emf.codegen"),new Path("plugin.xml")); //$NON-NLS-1$ //$NON-NLS-2$
- IPath jrePath = new Path(Platform.asLocalURL(jreURL).getFile());
- jrePath = jrePath.removeLastSegments(1).append(new Path("../../jre/lib/rt.jar")); //$NON-NLS-1$
- if (!jrePath.equals(JavaCore.getClasspathVariable(JavaRuntime.JRELIB_VARIABLE))) {
- JavaCore.setClasspathVariable(JavaRuntime.JRELIB_VARIABLE, jrePath, null);
- }
- }
-
- /*
- * final JETCompiler jetCompiler = templateURIPath == null ? new
- * MyJETCompiler(templateURI, encoding) :
- */
-
- getJetCompiler();
-
- progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETParsing_message", new Object[]{jetCompiler.getResolvedTemplateURI()})); //$NON-NLS-1$
- jetCompiler.parse();
- progressMonitor.worked(1);
-
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- jetCompiler.generate(outputStream);
- final InputStream contents = new ByteArrayInputStream(outputStream.toByteArray());
-
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IJavaModel javaModel = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- if (!javaModel.isOpen()) {
- javaModel.open(new SubProgressMonitor(progressMonitor, 1));
- } else {
- progressMonitor.worked(1);
- }
-
- final IProject project = workspace.getRoot().getProject(getProjectName());
- progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETPreparingProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
-
- IJavaProject javaProject;
- if (!project.exists()) {
- javaProject = createJavaProject(progressMonitor, workspace, project);
-
- initializeJavaProject(progressMonitor, project, javaProject);
-
- javaProject.close();
- } else {
- project.open(new SubProgressMonitor(progressMonitor, 5));
- javaProject = JavaCore.create(project);
- }
-
- IPackageFragmentRoot sourcePackageFragmentRoot = openJavaProjectIfNecessary(progressMonitor, project, javaProject);
-
- String packageName = jetCompiler.getSkeleton().getPackageName();
- StringTokenizer stringTokenizer = new StringTokenizer(packageName, "."); //$NON-NLS-1$
- IProgressMonitor subProgressMonitor = new SubProgressMonitor(progressMonitor, 1);
- subProgressMonitor.beginTask("", stringTokenizer.countTokens() + 4); //$NON-NLS-1$
- subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_CreateTargetFile_message")); //$NON-NLS-1$
- IContainer sourceContainer = (IContainer) sourcePackageFragmentRoot.getCorrespondingResource();
- while (stringTokenizer.hasMoreElements()) {
- String folderName = stringTokenizer.nextToken();
- sourceContainer = sourceContainer.getFolder(new Path(folderName));
- if (!sourceContainer.exists()) {
- ((IFolder) sourceContainer).create(false, true, new SubProgressMonitor(subProgressMonitor, 1));
- }
- }
- IFile targetFile = sourceContainer.getFile(new Path(jetCompiler.getSkeleton().getClassName() + ".java")); //$NON-NLS-1$
- if (!targetFile.exists()) {
- subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreating_message", new Object[]{targetFile.getFullPath()})); //$NON-NLS-1$
- targetFile.create(contents, true, new SubProgressMonitor(subProgressMonitor, 1));
- } else {
- subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETUpdating_message", new Object[]{targetFile.getFullPath()})); //$NON-NLS-1$
- targetFile.setContents(contents, true, true, new SubProgressMonitor(subProgressMonitor, 1));
- }
-
- boolean errors = performBuild(project, subProgressMonitor, targetFile);
-
- if (!errors) {
- loadClass(workspace, project, javaProject, packageName, subProgressMonitor);
- }
-
- subProgressMonitor.done();
- } catch (CoreException exception) {
- throw new JETException(exception);
- } catch (Exception exception) {
- throw new JETException(exception);
- } finally {
- progressMonitor.done();
- }
-
- }
-
- /**
- * @param progressMonitor
- * @param project
- * @param javaProject
- * @return
- * @throws JavaModelException
- */
- protected IPackageFragmentRoot openJavaProjectIfNecessary(IProgressMonitor progressMonitor, final IProject project, IJavaProject javaProject) throws JavaModelException {
- progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETOpeningJavaProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
- javaProject.open(new SubProgressMonitor(progressMonitor, 1));
-
- IPackageFragmentRoot[] packageFragmentRoots = javaProject.getPackageFragmentRoots();
- IPackageFragmentRoot sourcePackageFragmentRoot = null;
- for (int j = 0; j < packageFragmentRoots.length; ++j) {
- IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[j];
- if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
- sourcePackageFragmentRoot = packageFragmentRoot;
- break;
- }
- }
- return sourcePackageFragmentRoot;
- }
-
- /**
- * @param progressMonitor
- * @param project
- * @param javaProject
- * @throws CoreException
- * @throws JavaModelException
- */
- protected void initializeJavaProject(IProgressMonitor progressMonitor, final IProject project, IJavaProject javaProject) throws CoreException, JavaModelException {
- progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETInitializingProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
- IClasspathEntry classpathEntry = JavaCore.newSourceEntry(new Path("/" + project.getName() + "/src")); //$NON-NLS-1$ //$NON-NLS-2$
-
- IClasspathEntry jreClasspathEntry = JavaRuntime.getDefaultJREContainerEntry();
-
- List classpath = new ArrayList();
- classpath.add(classpathEntry);
- classpath.add(jreClasspathEntry);
- classpath.addAll(classpathEntries);
-
- IFolder sourceFolder = project.getFolder(new Path("src")); //$NON-NLS-1$
- if (!sourceFolder.exists()) {
- sourceFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
- }
- IFolder runtimeFolder = project.getFolder(new Path("runtime")); //$NON-NLS-1$
- if (!runtimeFolder.exists()) {
- runtimeFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
- }
-
- IClasspathEntry[] classpathEntryArray = (IClasspathEntry[]) classpath.toArray(new IClasspathEntry[classpath.size()]);
-
- javaProject.setRawClasspath(classpathEntryArray, new SubProgressMonitor(progressMonitor, 1));
-
- javaProject.setOutputLocation(new Path("/" + project.getName() + "/runtime"), new SubProgressMonitor(progressMonitor, 1)); //$NON-NLS-1$ //$NON-NLS-2$
-
- // appended from previous implementation
- createClasspathEntries(project);
- }
-
- /**
- * @param progressMonitor
- * @param workspace
- * @param project
- * @return
- * @throws CoreException
- */
- private IJavaProject createJavaProject(IProgressMonitor progressMonitor, final IWorkspace workspace, final IProject project) throws CoreException {
- IJavaProject javaProject;
- progressMonitor.subTask("JET creating project " + project.getName()); //$NON-NLS-1$
- project.create(new SubProgressMonitor(progressMonitor, 1));
- progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreatingProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
- IProjectDescription description = workspace.newProjectDescription(project.getName());
- description.setNatureIds(new String[]{JavaCore.NATURE_ID});
- description.setLocation(null);
- project.open(new SubProgressMonitor(progressMonitor, 1));
- project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
-
- javaProject = JavaCore.create(project);
- return javaProject;
- }
-
- /**
- * @param workspace
- * @param project
- * @param javaProject
- * @param packageName
- * @param subProgressMonitor
- * @throws JavaModelException
- * @throws MalformedURLException
- * @throws ClassNotFoundException
- * @throws SecurityException
- */
- protected void loadClass(final IWorkspace workspace, final IProject project, IJavaProject javaProject, String packageName, IProgressMonitor subProgressMonitor) throws JavaModelException, MalformedURLException, ClassNotFoundException, SecurityException {
- //IContainer targetContainer =
- // workspace.getRoot().getFolder(javaProject.getOutputLocation());
-
- subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETLoadingClass_message", new Object[]{jetCompiler.getSkeleton().getClassName() + ".class"})); //$NON-NLS-1$ //$NON-NLS-2$
-
- // Construct a proper URL for relative lookup.
- //
- URL url = new File(project.getLocation() + "/" + javaProject.getOutputLocation().removeFirstSegments(1) + "/").toURL(); //$NON-NLS-1$ //$NON-NLS-2$
- URLClassLoader theClassLoader = new URLClassLoader(new URL[]{url}, classLoader);
- Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") + jetCompiler.getSkeleton().getClassName()); //$NON-NLS-1$ //$NON-NLS-2$
- String methodName = jetCompiler.getSkeleton().getMethodName();
- Method[] methods = theClass.getDeclaredMethods();
- for (int i = 0; i < methods.length; ++i) {
- if (methods[i].getName().equals(methodName)) {
- setMethod(methods[i]);
- break;
- }
- }
- }
-
- /**
- * @param project
- * @param subProgressMonitor
- * @param targetFile
- * @return
- * @throws CoreException
- */
- protected boolean performBuild(final IProject project, IProgressMonitor subProgressMonitor, IFile targetFile) throws CoreException {
- subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", new Object[]{project.getName()})); //$NON-NLS-1$
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(subProgressMonitor, 1));
-
- IMarker[] markers = targetFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
- boolean errors = false;
- for (int i = 0; i < markers.length; ++i) {
- IMarker marker = markers[i];
- if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
- errors = true;
- subProgressMonitor.subTask(marker.getAttribute(IMarker.MESSAGE) + " : " + (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[]{targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER)}))); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return errors;
- }
-
- /**
- * Create the correct classpath entries for the given project
- *
- * @param project
- */
- protected void createClasspathEntries(IProject project) {
- Assert.isNotNull(project, "A valid project is required in order to append to a classpath"); //$NON-NLS-1$
- String variableName = null;
- String pluginId = null;
- for (Iterator variablesKeyIterator = getVariables().keySet().iterator(); variablesKeyIterator.hasNext();) {
- variableName = (String) variablesKeyIterator.next();
- pluginId = (String) getVariables().get(variableName);
- if (hasOutputDirectory(pluginId))
- addLinkedFolderAsLibrary(project, variableName, pluginId);
- else
- addRuntimeJarsAsLibrary(project, pluginId);
- }
- }
-
- /**
- * @param pluginId
- * @return
- */
- protected boolean hasOutputDirectory(String pluginId) {
- Bundle bundle = Platform.getBundle(pluginId);
- URL outputDirectory = Platform.find(bundle,new Path("bin")); //$NON-NLS-1$
- if (outputDirectory == null)
- return false;
- URL installLocation = null;
- try {
- installLocation = Platform.asLocalURL(outputDirectory);
- } catch (IOException e) {
- Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{installLocation}) + e); //$NON-NLS-1$
- }
- File outputDirectoryFile = new File(installLocation.getPath());// new File(location);
- return outputDirectoryFile.canRead() && outputDirectoryFile.isDirectory() && outputDirectoryFile.listFiles().length > 0;
- }
-
- /**
- * @param project
- * @param variableName
- * @param pluginId
- */
- protected void addRuntimeJarsAsLibrary(IProject project, String pluginId) {
- ManifestElement[] elements = null;
- Bundle bundle = Platform.getBundle(pluginId);
- try {
- String requires = (String) bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
- elements = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, requires);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- elements = new ManifestElement[0];
- }
- IPath runtimeLibFullPath = null;
- URL fullurl = null;
- if (elements == null) {
- if (bundle.getLocation().endsWith(".jar")) //$NON-NLS-1$
- runtimeLibFullPath = getJarredPluginPath(bundle);
- appendToClassPath(runtimeLibFullPath,project);
- return;
- }
- for (int i = 0; i < elements.length; i++) {
- String value = elements[i].getValue();
- if (".".equals(value)) //$NON-NLS-1$
- value = "/"; //$NON-NLS-1$
- fullurl = Platform.getBundle(pluginId).getEntry(value);
- // fix the problem with leading slash that caused dup classpath entries
- if (fullurl==null) continue;
- try {
- runtimeLibFullPath = new Path(Platform.asLocalURL(fullurl).getPath());
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- //TODO handle jar'ed plugins, this is a hack for now, need to find proper bundle API
- if (bundle.getLocation().endsWith(".jar")) //$NON-NLS-1$
- runtimeLibFullPath = getJarredPluginPath(bundle);
- if (!"jar".equals(runtimeLibFullPath.getFileExtension()) && !"zip".equals(runtimeLibFullPath.getFileExtension())) //$NON-NLS-1$ //$NON-NLS-2$
- continue;
- appendToClassPath(runtimeLibFullPath,project);
- }
- }
-
- private void appendToClassPath(IPath runtimeLibFullPath, IProject project) {
- IClasspathEntry entry = null;
- entry = new ClasspathEntry(IPackageFragmentRoot.K_BINARY, IClasspathEntry.CPE_LIBRARY, runtimeLibFullPath, ClasspathEntry.INCLUDE_ALL, ClasspathEntry.EXCLUDE_NONE, null,
- null, null, false, null,false,ClasspathEntry.NO_EXTRA_ATTRIBUTES);
- try {
- J2EEProjectUtilities.appendJavaClassPath(project, entry);
- } catch (JavaModelException e) {
- Logger.getLogger().logError("Problem appending \"" + entry.getPath() + "\" to classpath of Project \"" + project.getName() + "\"."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- Logger.getLogger().logError(e);
- }
- }
-
- private IPath getJarredPluginPath(Bundle bundle) {
- Path runtimeLibFullPath = null;
- String jarPluginLocation = bundle.getLocation().substring(7);
- Path jarPluginPath = new Path(jarPluginLocation);
- // handle case where jars are installed outside of eclipse installation
- if (jarPluginPath.isAbsolute())
- runtimeLibFullPath = jarPluginPath;
- // handle normal case where all plugins under eclipse install
- else {
- String installPath = Platform.getInstallLocation().getURL().getPath();
- runtimeLibFullPath = new Path(installPath+"/"+jarPluginLocation); //$NON-NLS-1$
- }
- return runtimeLibFullPath;
- }
-
- /**
- * @param progressMonitor
- */
- protected void updateProgress(IProgressMonitor progressMonitor, String key) {
- progressMonitor.subTask(getMessage(key));
- }
-
- /**
- * @param progressMonitor
- */
- protected void updateProgress(IProgressMonitor progressMonitor, String key, Object[] args) {
- progressMonitor.subTask(getMessage(key, args));
- }
-
- protected String getMessage(String key) {
- return CodeGenPlugin.getPlugin().getString(key);
- }
-
- protected String getMessage(String key, Object[] args) {
- return CodeGenPlugin.getPlugin().getString(key, args);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.codegen.jet.JETEmitter#addVariable(java.lang.String, java.lang.String)
- */
- public void addVariable(String variableName, String pluginID) throws JETException {
- if (!isIntelligentLinkingEnabled())
- super.addVariable(variableName, pluginID);
- else {
- getVariables().put(variableName, pluginID);
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject project = workspace.getRoot().getProject(getProjectName());
- if (project != null && project.exists())
- createClasspathEntries(project);
- }
-
- }
-
- /**
- * @return
- */
- private boolean isIntelligentLinkingEnabled() {
- return intelligentLinkingEnabled;
- }
-
- /**
- * @return
- */
- private Map getVariables() {
- if (variables == null)
- variables = new HashMap();
- return variables;
- }
-
- protected void addLinkedFolderAsLibrary(IProject project, String variableName, String pluginID) {
- try {
- URL outputDirectory = Platform.find(Platform.getBundle(pluginID),new Path("bin")); //$NON-NLS-1$
-// IPluginDescriptor pluginDescriptor = Platform.getPlugin(pluginID).getDescriptor();
-// URL outputDirectory = pluginDescriptor.find(new Path("bin")); //$NON-NLS-1$
- String pathString = Platform.asLocalURL(outputDirectory).getPath();
- if (pathString.endsWith("/")) //$NON-NLS-1$
- pathString = pathString.substring(0, pathString.length() - 1);
- if (pathString.startsWith("/")) //$NON-NLS-1$
- pathString = pathString.substring(1, pathString.length());
- IPath path = new Path(pathString).makeAbsolute();
-
- String binDirectoryVariable = variableName + "_BIN"; //$NON-NLS-1$
- IFolder linkedDirectory = project.getFolder(binDirectoryVariable);
- if (!linkedDirectory.exists()) {
- linkedDirectory.createLink(path, IResource.ALLOW_MISSING_LOCAL, null);
- linkedDirectory.setDerived(true);
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
- IClasspathEntry entry = new ClasspathEntry(IPackageFragmentRoot.K_BINARY, IClasspathEntry.CPE_LIBRARY, linkedDirectory.getFullPath(), ClasspathEntry.INCLUDE_ALL, ClasspathEntry.EXCLUDE_NONE, null, // source
- // attachment
- null, // source attachment root
- null, // custom output location
- false,null,false,ClasspathEntry.NO_EXTRA_ATTRIBUTES);
-
- J2EEProjectUtilities.appendJavaClassPath(project, entry);
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
-
- /**
- * @param intelligentLinkingEnabled
- * The intelligentLinkingEnabled to set.
- */
- public void setIntelligentLinkingEnabled(boolean intelligentLinkingEnabled) {
- this.intelligentLinkingEnabled = intelligentLinkingEnabled;
- }
-
- protected JETCompiler getJetCompiler() {
- try {
- if (jetCompiler == null) {
- jetCompiler = templateURIPath == null ? new MyJETCompiler(templateURI, encoding) : new MyJETCompiler(templateURIPath, templateURI, encoding);
- }
- } catch (JETException e) {
- Logger.getLogger().logError(e);
- }
- return jetCompiler;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/test.jpage b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/test.jpage
deleted file mode 100644
index e69de29..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/test.jpage
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/ClasspathRenameInfo.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/ClasspathRenameInfo.java
deleted file mode 100644
index ba2780c..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/ClasspathRenameInfo.java
+++ /dev/null
@@ -1,76 +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.jst.j2ee.internal.rename;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * A simple structure that remembers for a given project, the manifest entries to be deleted and the
- * build path entries to be deleted
- */
-public class ClasspathRenameInfo {
- /**
- * The project from which the dependencies will be removed
- */
- protected IProject targetProject;
- /**
- * The literal manifest entries to be removed; String
- */
- protected List manifestEntries;
- /**
- * The project references to be removed from the build path; IProject
- */
- protected List referencedProjects;
-
- public ClasspathRenameInfo(IProject project) {
- super();
- targetProject = project;
- }
-
- /**
- * Gets the manifestEntries.
- *
- * @return Returns a List
- */
- public List getManifestEntries() {
- if (manifestEntries == null)
- manifestEntries = new ArrayList();
- return manifestEntries;
- }
-
-
- /**
- * Gets the referencedProjects.
- *
- * @return Returns a List
- */
- public List getReferencedProjects() {
- if (referencedProjects == null)
- referencedProjects = new ArrayList();
- return referencedProjects;
- }
-
-
- /**
- * Gets the targetProject.
- *
- * @return Returns a IProject
- */
- public IProject getTargetProject() {
- return targetProject;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameOptions.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameOptions.java
deleted file mode 100644
index 3041a24..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameOptions.java
+++ /dev/null
@@ -1,165 +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.jst.j2ee.internal.rename;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class RenameOptions {
- protected boolean isEARRename;
- protected boolean renameProjects;
- protected boolean renameModules;
- protected boolean renameModuleDependencies;
- protected List selectedProjects;
- /** Applicable for EAR rename */
- protected List selectedReferencedProjects;
- protected String newName = null;
- protected String newContextRoot = null;
- protected boolean bogus;
-
- /**
- * Constructor for RenameOptions.
- */
- public RenameOptions() {
- super();
- }
-
-
- public boolean shouldRenameModules() {
- return renameModules;
- }
-
-
- public void setRenameModules(boolean renameModulesFromAllEARs) {
- this.renameModules = renameModulesFromAllEARs;
- }
-
-
- public boolean shouldRenameProjects() {
- return renameProjects;
- }
-
-
- public void setRenameProjects(boolean renameProjects) {
- this.renameProjects = renameProjects;
- }
-
-
- public boolean shouldRenameModuleDependencies() {
- return renameModuleDependencies;
- }
-
-
- public void setRenameModuleDependencies(boolean renameReferencesFromModuleDependencies) {
- this.renameModuleDependencies = renameReferencesFromModuleDependencies;
- }
-
- public List getModuleAndUtilityProjects() {
- if (isEARRename)
- return getSelectedReferencedProjects();
- return getSelectedProjects();
- }
-
- public List getAllProjectsToRename() {
- List result = new ArrayList();
- result.addAll(getSelectedProjects());
- result.addAll(getSelectedReferencedProjects());
- return result;
- }
-
- /**
- * Gets the selectedProjects.
- *
- * @return Returns a List
- */
- public List getSelectedProjects() {
- if (selectedProjects == null)
- return Collections.EMPTY_LIST;
- return selectedProjects;
- }
-
- /**
- * Sets the selectedProjects.
- *
- * @param selectedProjects
- * The selectedProjects to set
- */
- public void setSelectedProjects(List selectedProjects) {
- this.selectedProjects = selectedProjects;
- }
-
- /**
- * Gets the selectedReferencedProjects.
- *
- * @return Returns a List
- */
- public List getSelectedReferencedProjects() {
- if (selectedReferencedProjects == null)
- return Collections.EMPTY_LIST;
- return selectedReferencedProjects;
- }
-
- /**
- * Sets the selectedReferencedProjects.
- *
- * @param selectedReferencedProjects
- * The selectedReferencedProjects to set
- */
- public void setSelectedReferencedProjects(List selectedReferencedProjects) {
- this.selectedReferencedProjects = selectedReferencedProjects;
- }
-
- public boolean isEARRename() {
- return isEARRename;
- }
-
- public void setIsEARRename(boolean isEARRename) {
- this.isEARRename = isEARRename;
- }
-
- /**
- * Gets the newName.
- *
- * @return Returns a String
- */
- public String getNewName() {
- return newName;
- }
-
- /**
- * Sets the newName.
- *
- * @param newName
- * The newName to set
- */
- public void setNewName(String newName) {
- this.newName = newName;
- }
-
- /**
- * Gets the newContextRoot.
- *
- * @return Returns a String
- */
- public String getNewContextRoot() {
- return newContextRoot;
- }
-
- /**
- * Sets the newContextRoot.
- *
- * @param newContextRoot
- * The newContextRoot to set
- */
- public void setNewContextRoot(String newContextRoot) {
- this.newContextRoot = newContextRoot;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/IServerTargetConstants.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/IServerTargetConstants.java
deleted file mode 100644
index d54ae20..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/IServerTargetConstants.java
+++ /dev/null
@@ -1,41 +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
- *******************************************************************************/
-/*
- * Created on Aug 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.servertarget;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface IServerTargetConstants {
- String EAR_TYPE = "j2ee.ear"; //$NON-NLS-1$
- String WEB_TYPE = "j2ee.web"; //$NON-NLS-1$
- String WEB_PORTAL_TYPE = "j2ee.web.portal"; //$NON-NLS-1$
- String EJB_TYPE = "j2ee.ejb"; //$NON-NLS-1$
- String APP_CLIENT_TYPE = "j2ee.appclient"; //$NON-NLS-1$
- String CONNECTOR_TYPE = "j2ee.connector"; //$NON-NLS-1$
- String J2EE_12 = "1.2"; //$NON-NLS-1$
- String J2EE_13 = "1.3"; //$NON-NLS-1$
- String J2EE_14 = "1.4"; //$NON-NLS-1$
- String SERVER_FILE_NAME = ".server"; //$NON-NLS-1$
- String aesV4ServerTargetId = "com.ibm.etools.websphere.aes.v4";//$NON-NLS-1$
- String v5ServerTargetId = "com.ibm.etools.websphere.serverTarget.base.v5";//$NON-NLS-1$
- String v51ServerTargetId = "com.ibm.etools.websphere.serverTarget.base.v51";//$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ITargetRuntimeExtensionHandler.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ITargetRuntimeExtensionHandler.java
deleted file mode 100644
index 5b7882d..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ITargetRuntimeExtensionHandler.java
+++ /dev/null
@@ -1,29 +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
- *******************************************************************************/
-/*
- * Created on Feb 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.servertarget;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface ITargetRuntimeExtensionHandler {
- public boolean removeTargetRuntimeClasspath(IProject project);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModelProvider.java
deleted file mode 100644
index 1a58029..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModelProvider.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.servertarget;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-public class J2EEProjectServerTargetDataModelProvider extends AbstractDataModelProvider implements IJ2EEProjectServerTargetDataModelProperties {
-
- private static final String DEFAULT_TARGET_ID = "org.eclipse.jst.server.core.runtimeType"; //$NON-NLS-1$
-
- public void init() {
- model.setProperty(RUNTIME_TARGET_ID, getDefaultServerTargetID());
- super.init();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new J2EEProjectServerTargetOp(model);
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(RUNTIME_TARGET_ID);
- propertyNames.add(J2EE_VERSION_ID);
- propertyNames.add(DEPLOYMENT_TYPE_ID);
- propertyNames.add(UPDATE_MODULES);
- return propertyNames;
- }
-
- public IProject getProject() {
- String name = (String) getProperty(PROJECT_NAME);
- if (name != null && name.length() > 0)
- return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- return null;
- }
-
- public IRuntime getRuntimeTarget() {
- String serverTargetId = (String) getProperty(RUNTIME_TARGET_ID);
- return ResourceManager.getInstance().getRuntime(serverTargetId);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultProperty(java.lang.String)
- */
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(RUNTIME_TARGET_ID))
- return getDefaultServerTargetID();
- else if (propertyName.equals(J2EE_VERSION_ID))
- return getDefaultVersionID();
- else if (propertyName.equals(UPDATE_MODULES)) {
- return Boolean.TRUE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- private Integer getDefaultVersionID() {
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID);
- }
-
- /**
- * @return
- */
- private Object getDefaultServerTargetID() {
- List targets = getValidServerTargets();
- if (!targets.isEmpty()) {
- IRuntime target = null;
- for (int i = targets.size() - 1; i < targets.size() && i >= 0; i--) {
- target = (IRuntime) targets.get(i);
- if (DEFAULT_TARGET_ID.equals(target.getId()))
- return target.getId();
- }
- if (target != null)
- return target.getId();
- }
- return null;
- }
-
- /**
- * This should only be used by clients that need to interact with the Server tooling directly.
- * The return value corresponds to the type id associated with a runtime target.
- *
- * @return
- */
- public String computeTypeId() {
- int type = -1;
- if (getDataModel().isPropertySet(DEPLOYMENT_TYPE_ID))
- type = getIntProperty(DEPLOYMENT_TYPE_ID);
- // else {
- // J2EENature nature = J2EENature.getRegisteredRuntime(getProject());
- // if (nature != null)
- // type = nature.getDeploymentDescriptorType();
- // else
- // type = getIntProperty(DEPLOYMENT_TYPE_ID);
- // }
- return computeTypeId(type);
- }
-
- /**
- * @param deploymentDescriptorType2
- * @return
- */
- private String computeTypeId(int deploymentDescriptorType) {
- switch (deploymentDescriptorType) {
- case XMLResource.APPLICATION_TYPE :
- return IServerTargetConstants.EAR_TYPE;
- case XMLResource.APP_CLIENT_TYPE :
- return IServerTargetConstants.APP_CLIENT_TYPE;
- case XMLResource.EJB_TYPE :
- return IServerTargetConstants.EJB_TYPE;
- case XMLResource.WEB_APP_TYPE :
- return IServerTargetConstants.WEB_TYPE;
- case XMLResource.RAR_TYPE :
- return IServerTargetConstants.CONNECTOR_TYPE;
- }
- return null;
- }
-
- /**
- * This is only to be used by clients that need to interact with the Server tooling directly.
- * The return value corresponds to the version id associated with a runtime target.
- */
- public String computeVersionId() {
- int version = -1;
- if (getDataModel().isPropertySet(J2EE_VERSION_ID))
- version = getIntProperty(J2EE_VERSION_ID);
- // else {
- // J2EENature nature = J2EENature.getRegisteredRuntime(getProject());
- // if (nature != null)
- // version = nature.getJ2EEVersion();
- // else
- // version = getIntProperty(J2EE_VERSION_ID);
- // }
- return computeVersionId(version);
- }
-
- /**
- * @param version
- * @return
- */
- private String computeVersionId(int version) {
- switch (version) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- return IServerTargetConstants.J2EE_12;
- case J2EEVersionConstants.J2EE_1_3_ID :
- return IServerTargetConstants.J2EE_13;
- case J2EEVersionConstants.J2EE_1_4_ID :
- return IServerTargetConstants.J2EE_14;
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doGetValidPropertyValues(java.lang.String)
- */
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (propertyName.equals(RUNTIME_TARGET_ID))
- return getValidServerTargetDescriptors();
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- private DataModelPropertyDescriptor[] getValidServerTargetDescriptors() {
- List targets = getValidServerTargets();
- DataModelPropertyDescriptor[] descriptors = null;
- if (!targets.isEmpty()) {
- int serverTargetListSize = targets.size();
- descriptors = new DataModelPropertyDescriptor[serverTargetListSize];
- for (int i = 0; i < targets.size(); i++) {
- IRuntime runtime = (IRuntime) targets.get(i);
- descriptors[i] = new DataModelPropertyDescriptor(runtime.getId(), runtime.getName());
- }
- } else {
- descriptors = new DataModelPropertyDescriptor[0];
- }
- return descriptors;
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (propertyName.equals(J2EE_VERSION_ID)) {
- IRuntime target = getServerTargetByID(getStringProperty(RUNTIME_TARGET_ID));
- if (target == null)
- setProperty(RUNTIME_TARGET_ID, null);
- model.notifyPropertyChange(RUNTIME_TARGET_ID, IDataModel.VALID_VALUES_CHG);
- } else if (RUNTIME_TARGET_ID.equals(propertyName)) {
- setProperty(RUNTIME_TARGET_ID, propertyValue);
- }
- return true;
- }
-
-
- private IRuntime getServerTargetByID(String id) {
- List targets = getValidServerTargets();
- IRuntime target;
- for (int i = 0; i < targets.size(); i++) {
- target = (IRuntime) targets.get(i);
- if (id.equals(target.getId()))
- return target;
- }
- return null;
- }
-
- /**
- * @return
- */
- private List getValidServerTargets() {
- List validServerTargets = null;
- // TODO: api is needed from the server target helper to get all server targets
- // validServerTargets = ServerTargetHelper.getServerTargets(IServerTargetConstants.EAR_TYPE,
- // IServerTargetConstants.J2EE_14);
- validServerTargets = getServerTargets("", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (validServerTargets != null && validServerTargets.isEmpty())
- validServerTargets = null;
- if (validServerTargets == null)
- return Collections.EMPTY_LIST;
- return validServerTargets;
- }
-
- public static List getServerTargets(String type, String version) {
- List targets = Arrays.asList(ServerUtil.getRuntimes(type, version));
- return targets;
- }
-
- /**
- * @return
- */
- // private List getValidServerTargets() {
- // List validServerTargets = null;
- // String type = computeTypeId();
- // if (type != null) {
- // String version = computeVersionId();
- // if (version != null) {
- // validServerTargets = ServerTargetHelper.getServerTargets(type, version);
- // if (validServerTargets != null && validServerTargets.isEmpty())
- // validServerTargets = null;
- // }
- // }
- // if (validServerTargets == null)
- // return Collections.EMPTY_LIST;
- // return validServerTargets;
- // }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- public IStatus validate(String propertyName) {
- if (propertyName.equals(RUNTIME_TARGET_ID))
- return validateServerTarget();
- return super.validate(propertyName);
- }
-
- /**
- * @return
- */
- private IStatus validateServerTarget() {
- List targets = getValidServerTargets();
- if (targets.isEmpty()) {
- return J2EEPlugin.newErrorStatus(J2EECreationResourceHandler.ServerTargetDataModel_UI_7, null);
- }
- IRuntime target = getRuntimeTarget();
- if (target == null) {
- return J2EEPlugin.newErrorStatus(J2EECreationResourceHandler.ServerTargetDataModel_UI_8, null);
- } else if (!targets.contains(target)) {
- return J2EEPlugin.newErrorStatus(J2EECreationResourceHandler.ServerTargetDataModel_UI_9, null);
- }
- return OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOp.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOp.java
deleted file mode 100644
index 2150639..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOp.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.servertarget;
-
-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.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-public class J2EEProjectServerTargetOp extends AbstractDataModelOperation {
-
- /**
- * @param operationDataModel
- */
- public J2EEProjectServerTargetOp(IDataModel model) {
- super(model);
- // TODO Auto-generated constructor stub
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- String serverTargetId = model.getStringProperty(IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID);
- IRuntime runtime = ResourceManager.getInstance().getRuntime(serverTargetId);
- IProject project = null;
- String name = model.getStringProperty(IJ2EEProjectServerTargetDataModelProperties.PROJECT_NAME);
- if (name != null && name.length() > 0)
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (runtime != null && project != null) {
- try {
- //ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor);
- if (model.getBooleanProperty(IJ2EEProjectServerTargetDataModelProperties.UPDATE_MODULES)
- && project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- //ServerTargetHelper.setNewServerTargetForEARModules(runtime, project);
- //ServerTargetHelper.setNewServerTargetForEARUtilityJars(runtime, project);
- }
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- return OK_STATUS;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java
deleted file mode 100644
index 879a735..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java
+++ /dev/null
@@ -1,476 +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
- *******************************************************************************/
-/*
- * Created on Aug 15, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.servertarget;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-//import com.ibm.etools.j2ee.internal.project.EAREditModel;
-//import com.ibm.etools.j2ee.internal.project.EARNatureRuntime;
-
-/**
- * @author vijayb
- * @deprecated - Use server core api to set Runtime Targets. Use artifact edit api to
- * get to any j2ee related methods in the class.
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ServerTargetHelper {
- public static final String JAVA_NATURE_ID = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$
-
- public static final String SERVER_CONTAINER = "org.eclipse.jst.server.core.container"; //$NON-NLS-1$
-
- /**
- *
- */
- public ServerTargetHelper() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public static void cleanUpNonServerTargetClasspath(IProject project) {
- List existingClasspathEntries = ServerTargetHelper.getExistingNonServerTargetClasspath(project);
- if (!existingClasspathEntries.isEmpty())
- ServerTargetHelper.removeNonSeverTargetClasspathEntries(project, existingClasspathEntries);
- }
-
- /**
- * @param existingClasspathEntries
- */
- public static void removeNonSeverTargetClasspathEntries(IProject project, List existingClasspathEntries) {
- try {
- JemProjectUtilities.removeFromJavaClassPath(project, existingClasspathEntries);
- } catch (JavaModelException jme) {
- Logger.getLogger().logError(jme);
- }
- }
-
- /**
- * @param project
- */
- // public static void syncNoServerTargetForEARModules(IProject project) {
- // removeServerTargetForEARModuleProjects(project);
- // removeServerTargetForEARUtilsProject(project);
- // }
- /**
- * @param project
- */
- // public static void removeServerTargetForEAR(IProject project, boolean
- // updateModules) {
- // //We don't need to remove a server target anyomre as it need to be
- // // there
- // //ServerTargetManager.removeServerTarget(project, null);
- // if (updateModules) {
- // removeServerTargetForEARModuleProjects(project);
- // removeServerTargetForEARUtilsProject(project);
- // }
- // }
- /**
- * @param project
- */
- // private static void removeServerTargetForEARModuleProjects(IProject
- // project) {
- // List moduleProjects =
- // ServerTargetHelper.getAllEarModuleProjects(project);
- // if (!moduleProjects.isEmpty()) {
- // for (int i = 0; i < moduleProjects.size(); i++) {
- // IProject moduleProject = (IProject) moduleProjects.get(i);
- // ServerTargetType tt =
- // ServerTargetManager.getServerTargetType(moduleProject);
- // if (tt != null) {
- // J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(moduleProject);
- // if (info != null) {
- // info.setProject(moduleProject);
- // try {
- // info.calculateServerClasspathEntries();
- // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null);
- // } catch (JavaModelException jme) {
- // Logger.getLogger().logTrace(jme);
- // }
- // }
- // }
- // }
- // }
- // }
- /**
- * @param project
- */
- // private static void removeServerTargetForEARUtilsProject(IProject
- // project) {
- // EARNatureRuntime nature = EARNatureRuntime.getRuntime(project);
- // EAREditModel editModel = null;
- // Object key = new ServerTargetHelper();
- // try {
- // editModel = nature.getEarEditModelForRead(key);
- // List utilProjects =
- // ServerTargetHelper.getAllEarUtilityProjects(editModel, project);
- // if (!utilProjects.isEmpty()) {
- // for (int i = 0; i < utilProjects.size(); i++) {
- // IProject moduleProject = (IProject) utilProjects.get(i);
- // //We don't need to remove a server target anyomre as it need to be there
- // //ServerTargetType existingTargetType =
- // // ServerTargetManager.getServerTargetType(moduleProject);
- // //if (existingTargetType != null) {
- // //if (!editModel.isEjbClientJarProject(moduleProject))
- // //We don't need to remove a server target anyomre as it
- // // need to be there
- // //ServerTargetManager.removeServerTarget(moduleProject,null);
- // //else
- // // removeServerTargetForEJBClientJar(moduleProject);
- // }
- // }
- // } finally {
- // editModel.releaseAccess(key);
- // }
- // }
- /**
- * @param moduleProject
- */
- // public static void removeServerTargetForEJBClientJar(IProject
- // ejbClientJarProject) {
- // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
- // J2EEJavaProjectInfo info = ejbExt.createProjectInfo();
- // if (info != null) {
- // info.setProject(ejbClientJarProject);
- // try {
- // info.calculateServerClasspathEntries();
- // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null);
- // } catch (JavaModelException jme) {
- // Logger.getLogger().logTrace(jme);
- // }
- // }
- // }
- // public static void removeServerTargetOnProject(IProject project, String
- // projectType) {
- // setServerClassPathForJ2EEProject(project, projectType);
- // }
- /**
- * @param project
- */
- // public static void setServerClassPathForJ2EEProject(IProject project,
- // String projectType) {
- // try {
- // J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(project, projectType);
- // if (info != null) {
- // info.setProject(project);
- // info.calculateServerClasspathEntries();
- // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null);
- // }
- // } catch (JavaModelException jme) {
- // Logger.getLogger().logError(jme);
- // }
- // }
- // public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project,
- // String projectType)
- // {
- // if (projectType.equals(IServerTargetConstants.APP_CLIENT_TYPE))
- // return new ApplicationClientProjectInfo();
- // else if (projectType.equals(IServerTargetConstants.WEB_TYPE)) {
- // WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
- // J2EEJavaProjectInfo info = webExt.createProjectInfo();
- // String webNature = J2EENature.getRegisteredRuntimeID(project);
- // info.setJ2EEVersion(webNature.equals(J2EEVersionConstants.VERSION_1_3_TEXT)
- // ?
- // J2EEVersionConstants.J2EE_1_3_ID : J2EEVersionConstants.J2EE_1_2_ID);
- // return info;
- // } else if (projectType.equals(IServerTargetConstants.EJB_TYPE)) {
- // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
- // return ejbExt.createProjectInfo();
- // } else if (projectType.equals(IServerTargetConstants.CONNECTOR_TYPE)) {
- // JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension();
- // return jcaExt.createProjectInfo();
- // }
- // return null;
- // }
- // public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project)
- // {
- // if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) {
- // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
- // return ejbExt.createProjectInfo();
- // } else if (J2EENature.hasRuntime(project,
- // IWebNatureConstants.J2EE_NATURE_ID)) {
- // WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
- // return webExt.createProjectInfo();
- // } else if (ApplicationClientNatureRuntime.hasRuntime(project))
- // return new ApplicationClientProjectInfo();
- // else if (J2EENature.hasRuntime(project,
- // IConnectorNatureConstants.CONNECTOR_NATURE_ID)) {
- // JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension();
- // return jcaExt.createProjectInfo();
- // }
- // return null;
- // }
-// public static void setNewServerTargetForEARModules(IRuntime newServerTarget, IProject project) {
-// List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(project);
-// if (!moduleProjects.isEmpty()) {
-// for (int i = 0; i < moduleProjects.size(); i++) {
-// IProject moduleProject = (IProject) moduleProjects.get(i);
-// String[] projectAttr = ServerTargetHelper.getProjectTypeAndJ2EELevel(moduleProject);
-// if (projectAttr[0] != null && projectAttr[1] != null) {
-// IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget();
-// if (existingTargetType != null) {
-// if (!existingTargetType.getId().equals(newServerTarget.getId()))
-// setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr);
-// // TODO Move the WLP sync to this method
-// } else
-// setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr);
-// }
-// }
-// }
-// }
-
-// public static void setServerTargetForModuleProject(IRuntime newServerTarget, IProject moduleProject, String[] projectAttr) {
-// ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject);
-// setServerTarget(moduleProject, newServerTarget, null);
-// }
-
-// public static List getWebProjectsInEAR(IProject earProject) {
-// List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(earProject);
-// if (!moduleProjects.isEmpty()) {
-// List webProjects = new ArrayList();
-// for (int i = 0; i < moduleProjects.size(); i++) {
-// IProject project = (IProject) moduleProjects.get(i);
-// WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
-// if (webExt.hasRuntime(project))
-// webProjects.add(project);
-// }
-// return webProjects;
-// }
-// return Collections.EMPTY_LIST;
-// }
-
- /**
- * @param newServerTarget
- * @param tt
- * @param project
- */
-// public static void setNewServerTargetForEARUtilityJars(IRuntime newServerTarget, IProject project) {
-// EARNatureRuntime nature = EARNatureRuntime.getRuntime(project);
-// EAREditModel editModel = null;
-// Object key = new ServerTargetHelper();
-// try {
-// editModel = nature.getEarEditModelForRead(key);
-// List utilProjects = ServerTargetHelper.getAllEarUtilityProjects(editModel, project);
-// if (!utilProjects.isEmpty()) {
-// for (int i = 0; i < utilProjects.size(); i++) {
-// IProject moduleProject = (IProject) utilProjects.get(i);
-// IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget();
-// if (existingTargetType != null) {
-// if (!existingTargetType.getId().equals(newServerTarget.getId())) {
-// setServerTargetForUtilProject(newServerTarget, moduleProject);
-// }
-// } else {
-// setServerTargetForUtilProject(newServerTarget, moduleProject);
-// }
-// }
-// }
-// } finally {
-// editModel.releaseAccess(key);
-// }
-// }
-
-// public static void setServerTargetForUtilProject(IRuntime newServerTarget, IProject moduleProject) {
-// ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject);
-// setServerTarget(moduleProject, newServerTarget, null);
-// }
-
-// public static void setServerTarget(IProject project, IRuntime runtime, IProgressMonitor monitor) {
-// try {
-// ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor);
-// } catch (CoreException ce) {
-// Logger.getLogger().logError(ce);
-// }
-// }
-
- /**
- * @param earProject
- */
-// public static List getAllEarModuleProjects(IProject earProject) {
-// EARNatureRuntime nature = EARNatureRuntime.getRuntime(earProject);
-// EAREditModel editModel = null;
-// List moduleProjects = new ArrayList();
-// Object key = new ServerTargetHelper();
-// try {
-// editModel = nature.getEarEditModelForRead(key);
-// Set allModuleProjects = editModel.getModuleMappedModuleProjects();
-// if (!allModuleProjects.isEmpty())
-// moduleProjects.addAll(allModuleProjects);
-// return moduleProjects;
-// } finally {
-// if (editModel != null)
-// editModel.releaseAccess(key);
-// }
-// }
-//
- public static String[] getProjectTypeAndJ2EELevel(IProject project) {
- String[] projectAttr = new String[2];
-// boolean isJ2EE13 = true;
-// if (EARNatureRuntime.hasRuntime(project)) {
-// projectAttr[0] = IServerTargetConstants.EAR_TYPE;
-// isJ2EE13 = EARNatureRuntime.getRuntime(project).isJ2EE1_3();
-// } else if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) {
-// projectAttr[0] = IServerTargetConstants.EJB_TYPE;
-// isJ2EE13 = J2EENature.getRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS).isJ2EE1_3();
-// } else if (J2EENature.hasRuntime(project, IWebNatureConstants.J2EE_NATURE_ID)) {
-// projectAttr[0] = IServerTargetConstants.WEB_TYPE;
-// isJ2EE13 = J2EENature.getRuntime(project, IWebNatureConstants.J2EE_NATURE_ID).isJ2EE1_3();
-// } else if (J2EENature.hasRuntime(project,IApplicationClientNatureConstants.NATURE_ID)) {
-// projectAttr[0] = IServerTargetConstants.APP_CLIENT_TYPE;
-// isJ2EE13 = J2EENature.getRuntime(project,IApplicationClientNatureConstants.NATURE_ID).isJ2EE1_3();
-// } else if (J2EENature.hasRuntime(project, IConnectorNatureConstants.NATURE_ID)) {
-// projectAttr[0] = IServerTargetConstants.CONNECTOR_TYPE;
-// isJ2EE13 = J2EENature.getRuntime(project, IConnectorNatureConstants.NATURE_ID).isJ2EE1_3();
-// } else if (hasJavaNature(project))
-// projectAttr[0] = null;
-// if (projectAttr[0] != null && projectAttr[0].length() > 0) {
-// if (isJ2EE13)
-// projectAttr[1] = IServerTargetConstants.J2EE_13;
-// else
-// projectAttr[1] = IServerTargetConstants.J2EE_12;
-// }
- return projectAttr;
- }
-
- /**
- * @param project
- * @return
- */
- public static boolean hasJavaNature(IProject project) {
- try {
- return project.hasNature(JAVA_NATURE_ID);
- } catch (CoreException ce) {
- Logger.getLogger().logTrace(ce);
- }
- return false;
- }
-
- /**
- * @param earProject
- */
-// public static List getAllEarUtilityProjects(EAREditModel earEditModel, IProject earProject) {
-// List utilityProjects = new ArrayList();
-// Set utilProjects = earEditModel.getModuleMappedUtilityJarProjects();
-// if (!utilProjects.isEmpty())
-// utilityProjects.addAll(utilProjects);
-// return utilityProjects;
-// }
-
- public static int getExistingServerTargetIndex(List validServerTargets, IProject project) {
- if (validServerTargets != null) {
- IRuntime st = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (st != null) {
- for (int i = 0; i < validServerTargets.size(); i++) {
- if (((IRuntime) validServerTargets.get(i)).getId() == st.getId())
- return i;
- }
- }
- }
- return -1;
- }
-
- public static List getExistingNonServerTargetClasspath(IProject project) {
- IJavaProject javaProject = null;
- List list = new ArrayList();
- try {
- javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- } catch (Exception e) {
- }
- if (javaProject != null) {
- try {
- IClasspathEntry[] cp = javaProject.getRawClasspath();
- int size = cp.length;
- for (int i = 0; i < size; i++) {
- int entryKind = cp[i].getEntryKind();
- if (entryKind != IClasspathEntry.CPE_SOURCE && entryKind != IClasspathEntry.CPE_LIBRARY && entryKind != IClasspathEntry.CPE_PROJECT && (entryKind == IClasspathEntry.CPE_VARIABLE && isWASVariable(cp[i])) && (entryKind != IClasspathEntry.CPE_CONTAINER || !cp[i].getPath().segment(0).equals(SERVER_CONTAINER))) {
- list.add(cp[i]);
- }
- }
- } catch (Exception e) {
- }
- return list;
- }
- return list;
- }
-
- /**
- * @param entry
- * @return
- */
- private static boolean isWASVariable(IClasspathEntry entry) {
- // TODO This is no longer valid in the base.
- // IPath path = entry.getPath();
- // if (path != null && path.segmentCount() != 0) {
- // String classpathVariable = path.segment(0);
- // return
- // classpathVariable.equals(IEJBNatureConstants.WAS_PLUGINDIR_VARIABLE)
- // ||
- // classpathVariable.equals(IEJBNatureConstants.WAS_50_PLUGINDIR_VARIABLE)
- // ||
- // classpathVariable.equals(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE)
- // ||
- // classpathVariable.equals(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE)
- // || classpathVariable.equals(J2EEPlugin.SOAP_PLUGINDIR_VARIABLE)
- // || classpathVariable.equals(J2EEPlugin.SOAPSEC_PLUGINDIR_VARIABLE);
- // //|| classpathVariable.equals(J2EEPlugin.XERCES_IMPL_VARIABLE)
- // //|| classpathVariable.equals(J2EEPlugin.XERCES_PLUGINDIR_VARIABLE)
- // //|| classpathVariable.equals(J2EEPlugin.WORF_PLUGINDIR_VARIABLE)
- // //|| classpathVariable.equals(J2EEPlugin.MAIL_CLASSPATH_VARIABLE)
- // //||
- // classpathVariable.equals(J2EEPlugin.ACTIVATION_CLASSPATH_VARIABLE);
- // }
- return false;
- }
-
- /**
- * @param earProject
- * @param st
- * @return
- */
-// public static boolean serverTargetValidForEAR(IProject earProject, IRuntime st) {
-// return !(J2EENature.hasRuntime(earProject, IEARNatureConstants.NATURE_ID) && st.getId().equals(IServerTargetConstants.aesV4ServerTargetId));
-// }
-
- public static List getServerTargets(String type, String version) {
- List targets = Arrays.asList(ServerUtil.getRuntimes(type, version));
- return targets;
- }
- /*
- * public static ITargetType getV50TargetType(IProject project, IServerTarget v50ServerTarget) {
- * if (J2EENature.hasRuntime(project, IEARNatureConstants.NATURE_ID)) return
- * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EAR_TYPE); if
- * (J2EENature.hasRuntime(project, IApplicationClientNatureConstants.NATURE_ID)) return
- * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EAR_TYPE); else if
- * (J2EENature.hasRuntime(project, IEJBNatureConstants.NATURE_ID)) return
- * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EJB_TYPE); else if
- * (J2EENature.hasRuntime(project, IWebNatureConstants.J2EE_NATURE_ID)) return
- * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.WEB_TYPE); return
- * null; }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtension.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtension.java
deleted file mode 100644
index 26334b1..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtension.java
+++ /dev/null
@@ -1,62 +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
- *******************************************************************************/
-/*
- * Created on Feb 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.servertarget;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * @author vijayb
- * @deprecated
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class TargetRuntimeExtension {
- String groupID;
- String className;
- IConfigurationElement configElement;
- Plugin plugin;
-
- /**
- *
- */
- public TargetRuntimeExtension() {
- super();
- }
-
- public TargetRuntimeExtension(Plugin aPlugin, IConfigurationElement element, String groupId, String handlerClass) {
- super();
- plugin = aPlugin;
- configElement = element;
- groupID = groupId;
- className = handlerClass;
- }
-
- /**
- * @return
- */
- public String getGroupId() {
- return groupID;
- }
-
- /**
- * @param string
- */
- public void setGroupId(String string) {
- groupID = string;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtensionHandlerReader.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtensionHandlerReader.java
deleted file mode 100644
index f1b1bcc..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtensionHandlerReader.java
+++ /dev/null
@@ -1,143 +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
- *******************************************************************************/
-/*
- * Created on Feb 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.servertarget;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * @author vijayb
- * @deprecated
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class TargetRuntimeExtensionHandlerReader extends RegistryReader {
- static TargetRuntimeExtensionHandlerReader instance = null;
- protected ITargetRuntimeExtensionHandler targetRuntimeExtHandler;
- protected String HANDLER_EXT_Id = "targetRuntimeExtensionHandler"; //$NON-NLS-1$
- protected TargetRuntimeExtension extension = null;
- protected String HANDLER_CLASSNAME = "className"; //$NON-NLS-1$
- protected String HANDLER_GROUP_ID = "groupID"; //$NON-NLS-1$
- protected HashMap handlerExtensions = null;
-
- /**
- * @param registry
- * @param plugin
- * @param extensionPoint
- */
- public TargetRuntimeExtensionHandlerReader(IPluginRegistry registry, String plugin, String extensionPoint) {
- super(plugin, extensionPoint);
- }
-
- /**
- *
- */
- public TargetRuntimeExtensionHandlerReader() {
- super(J2EEPlugin.PLUGIN_ID, "TargetRuntimeExtHandler"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(HANDLER_EXT_Id))
- return false;
- String group = element.getAttribute(HANDLER_GROUP_ID);
- String className = element.getAttribute(HANDLER_CLASSNAME);
- if (group == null) {
- logMissingAttribute(element, "Missing group target runtime extension specification."); //$NON-NLS-1$
- return false;
- }
- try {
- Plugin plugin = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin();
- extension = new TargetRuntimeExtension(plugin, element, group, className);
- addExtensionPoint(extension);
- return true;
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- return false;
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtensionPoint(TargetRuntimeExtension newExtension) {
- if (handlerExtensions == null)
- handlerExtensions = new HashMap();
- Collection temp = null;
- Object holder = handlerExtensions.get(newExtension.getGroupId());
- if (temp == null) {
- temp = new ArrayList();
- temp.add(newExtension);
- } else {
- handlerExtensions.remove(newExtension.getGroupId());
- temp = (Collection) holder;
- temp.add(newExtension);
- }
- handlerExtensions.put(newExtension.getGroupId(), temp);
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a TargetRuntimeExtensionHandlerReader
- */
- public static TargetRuntimeExtensionHandlerReader getInstance() {
- if (instance == null)
- instance = new TargetRuntimeExtensionHandlerReader();
- return instance;
- }
-
- public ITargetRuntimeExtensionHandler getEJBExtHandler() {
- if (targetRuntimeExtHandler == null && handlerExtensions != null) {
- TargetRuntimeExtension codegenExt = null;
- ArrayList ibmExtensions = (ArrayList) handlerExtensions.get("IBM"); //$NON-NLS-1$
- if (ibmExtensions != null) {
- for (int i = 0; i < ibmExtensions.size(); i++) {
- Object obj = ibmExtensions.get(i);
- if (obj instanceof TargetRuntimeExtension) {
- codegenExt = (TargetRuntimeExtension) obj;
- break;
- }
- }
- }
- if (codegenExt != null) {
- IConfigurationElement cElement = codegenExt.configElement;
- try {
- targetRuntimeExtHandler = (ITargetRuntimeExtensionHandler) cElement.createExecutableExtension("run"); //$NON-NLS-1$
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- return targetRuntimeExtHandler;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IFlexibleJavaProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IFlexibleJavaProjectCreationDataModelProperties.java
deleted file mode 100644
index 2eb1e7c..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IFlexibleJavaProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,51 +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.jst.j2ee.project.datamodel.properties;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFlexibleProjectCreationDataModelProperties;
-/**
- * <p>
- * IFlexibleJavaProjectCreationDataModelProperties provides properties to the DataModel associated with the
- * FlexibleJavaProjectCreationDataModelProvider
- * @see org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IFlexibleJavaProjectCreationDataModelProperties extends IFlexibleProjectCreationDataModelProperties {
- /**
- * Required, type IDataModel. The user set IDataModel used to handle the creation of a server target for the project to be
- * created. Providers which currently exist for this IDataModel include J2EEProjectServerTargetDataModelProvider.
- */
- public static final String NESTED_MODEL_SERVER_TARGET = "IFlexibleProjectCreationDataModelProperties.NESTED_MODEL_SERVER_TARGET"; //$NON-NLS-1$
-
- /**
- * Optional, type Boolean The default value is <code>Boolean.TRUE</code>. If this property is set
- * to <code>Boolean.TRUE</code> then the server target specified by dataModel property <code>SERVER_TARGET_ID</code>
- * will be set on the generated artifact.
- *
- * @see SERVER_TARGET_ID
- */
- public static final String ADD_SERVER_TARGET = "IFlexibleProjectCreationDataModelProperties.ADD_SERVER_TARGET"; //$NON-NLS-1$
- /**
- * Optional, type String. This is used to specify the server target and is required if
- * the <code>ADD_SERVER_TARGET</code> property is set to <code>Boolean.TRUE</code>.
- */
- public static final String RUNTIME_TARGET_ID = IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IJ2EEProjectServerTargetDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IJ2EEProjectServerTargetDataModelProperties.java
deleted file mode 100644
index 735a26f..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IJ2EEProjectServerTargetDataModelProperties.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface IJ2EEProjectServerTargetDataModelProperties extends IDataModelProperties{
-
- /**
- * required, type String
- */
- public static final String PROJECT_NAME = "IJ2EEProjectServerTargetDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
- /**
- * required, not defaulted. If null, will not run.
- */
- public static final String RUNTIME_TARGET_ID = "IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID"; //$NON-NLS-1$
- /**
- * Optional - This needs to be set if the PROJECT_NAME does not exist.
- *
- * @link J2EEVersionConstants
- */
- public static final String J2EE_VERSION_ID = "IJ2EEProjectServerTargetDataModelProperties.J2EE_VERSION_ID"; //$NON-NLS-1$
-
- /**
- * optional, default true, type Boolean. Set this to true if the operation is supposed to update
- * all dependent modules and projects in an ear if the passed project name is an ear project
- */
- public static final String UPDATE_MODULES = "IJ2EEProjectServerTargetDataModelProperties.UPDATE_MODULES"; //$NON-NLS-1$
-
- /**
- * Optional - This needs to be set if the PROJECT_NAME does not exist.
- *
- * @link XMLResource#APP_CLIENT_TYPE
- * @link XMLResource#APPLICATION_TYPE
- * @link XMLResource#EJB_TYPE
- * @link XMLResource#RAR_TYPE
- * @link XMLResource#WEB_APP_TYPE
- */
- public static final String DEPLOYMENT_TYPE_ID = "IJ2EEProjectServerTargetDataModelProperties.DD_TYPE_ID"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetInstallDataModelProperties.java
deleted file mode 100644
index 968ed5d..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetInstallDataModelProperties.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.jst.j2ee.project.facet;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-
-public interface IJ2EEFacetInstallDataModelProperties extends IFacetInstallDataModelProperties {
-
- //TODO this property should probably be deleted
- public static final String RUNTIME_TARGET_ID = "IJ2EEFacetInstallDataModelProperties.RUNTIME_TARGET_ID"; //$NON-NLS-1$
-
- public static final String FACET_RUNTIME = IFacetProjectCreationDataModelProperties.FACET_RUNTIME;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetProjectCreationDataModelProperties.java
deleted file mode 100644
index b89e9c4..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-
-public interface IJ2EEFacetProjectCreationDataModelProperties
- extends IFacetProjectCreationDataModelProperties{
-
- public static final String ADD_TO_EAR = "IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
- public static final String EAR_PROJECT_NAME = "IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEModuleFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEModuleFacetInstallDataModelProperties.java
deleted file mode 100644
index 43851ee..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEModuleFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-public interface IJ2EEModuleFacetInstallDataModelProperties extends IJ2EEFacetInstallDataModelProperties{
-
- public static final String ADD_TO_EAR = "IJ2EEFacetInstallDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
- public static final String EAR_PROJECT_NAME = "IJ2EEFacetInstallDataModelProperties.EAR_PROJECT_NAME"; //$NON-NLS-1$
- public static final String CONFIG_FOLDER = "IJ2EEFacetInstallDataModelProperties.CONFIG_FOLDER"; //$NON-NLS-1$
- public static final String LAST_EAR_NAME = "IJ2EEModuleFacetInstallDataModelProperties.LAST_EAR_NAME"; //$NON-NLS-1$
- public static final String MODULE_URI = "IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEComponentCreationFacetOperation.java
deleted file mode 100644
index f7a9272..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.project.facet;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class J2EEComponentCreationFacetOperation extends AbstractDataModelOperation {
-
-
- public J2EEComponentCreationFacetOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- protected void setRuntime(IDataModel newModel, IDataModel facetModel) {
- String runtime = newModel.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID);
- try {
- if (runtime != null && runtime.trim().length() > 0) {
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = RuntimeManager.getRuntime(runtime);
- if (facetRuntime != null) {
- facetModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetRuntime);
- }
- }
- } catch (IllegalArgumentException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- protected IRuntime getRuntimeByID(String id) {
- IRuntime[] targets = ServerUtil.getRuntimes("", "");
- for (int i = 0; i < targets.length; i++) {
- IRuntime target = targets[i];
- if (id.equals(target.getId()))
- return target;
- }
- return null;
- }
-
- protected IDataModel setupJavaInstallAction() {
- IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- // dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.4"); //$NON-NLS-1$
- dm.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
- return dm;
- }
-
- protected IStatus addtoEar(String projectName, String earProjectName) {
-
- IStatus stat = OK_STATUS;
- IProject moduleProject = ProjectUtilities.getProject(projectName);
- IProject earProject = ProjectUtilities.getProject(earProjectName);
-
- IVirtualComponent comp = ComponentCore.createComponent(moduleProject);
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- if (comp != null && comp.exists() && earComp != null && earComp.exists()) {
-
- IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(comp);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- Map map = new HashMap();
- map.put(comp, model.getStringProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
- dataModel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, map);
- try {
- stat = dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- return stat;
- }
-
- protected void setAddToEARFromWizard(IDataModel newModel) {
- if (newModel != null && model != null)
- newModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDataModelProvider.java
deleted file mode 100644
index 140da48..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,33 +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.jst.j2ee.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public abstract class J2EEFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements IJ2EEFacetInstallDataModelProperties{
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(RUNTIME_TARGET_ID);
- names.add(FACET_RUNTIME);
- return names;
- }
-
- protected final int getJ2EEVersion() {
- return convertFacetVersionToJ2EEVersion((IProjectFacetVersion) getProperty(FACET_VERSION));
- }
-
- protected abstract int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDelegate.java
deleted file mode 100644
index 6cda40a..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDelegate.java
+++ /dev/null
@@ -1,91 +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.jst.j2ee.project.facet;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-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.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.ManifestFileCreationAction;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-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.IFacetedProject.Action.Type;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public abstract class J2EEFacetInstallDelegate {
-
- protected void installEARFacet(String j2eeVersionText, String earProjectName, IRuntime runtime, IProgressMonitor monitor){
-
- IProject project = ProjectUtilities.getProject(earProjectName);
- if( project.exists())
- return;
-
- IFacetedProject facetProj;
- try {
- facetProj = ProjectFacetsManager.create(earProjectName,
- null, monitor);
- facetProj.setRuntime(runtime, monitor);
-
- IDataModel earFacetInstallDataModel = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, earProjectName);
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, j2eeVersionText);
-
- Set actions = new HashSet();
- actions.add(new IFacetedProject.Action((Type) earFacetInstallDataModel.getProperty(IFacetDataModelProperties.FACET_TYPE),
- (IProjectFacetVersion) earFacetInstallDataModel.getProperty(IFacetDataModelProperties.FACET_VERSION),
- earFacetInstallDataModel));
-
-
- facetProj.modify(actions, null);
-
- try {
- FacetProjectCreationOperation.addDefaultFactets(facetProj, runtime);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- protected void createManifest(IProject project, IContainer aFolder, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- IFile file = aFolder.getFile(new Path(J2EEConstants.MANIFEST_URI));
- if (file.exists()) return;
- try {
- ManifestFileCreationAction.createManifestFile(file, project);
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- } catch (IOException e) {
- Logger.getLogger().log(e);
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 6c0eefa..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class J2EEFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider
- implements IJ2EEFacetProjectCreationDataModelProperties{
-
- public J2EEFacetProjectCreationDataModelProvider(){
- super();
- }
-
- public void init() {
- super.init();
- }
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(EAR_PROJECT_NAME);
- names.add(ADD_TO_EAR);
- return names;
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (EAR_PROJECT_NAME.equals(propertyName) || ADD_TO_EAR.equals(propertyName)) {
- if (getBooleanProperty(ADD_TO_EAR)) {
- IStatus status = validateEAR(model.getStringProperty(EAR_PROJECT_NAME));
- if (status.isOK()) {
- IProject earProject = ProjectUtilities.getProject(getStringProperty(EAR_PROJECT_NAME));
- if (earProject != null && earProject.exists()) {
- IFacetedProject facetdEarProject;
- try {
- facetdEarProject = ProjectFacetsManager.create(earProject);
- if (facetdEarProject != null) {
- setProperty(FACET_RUNTIME, facetdEarProject.getRuntime());
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- }
- }
- model.notifyPropertyChange(FACET_RUNTIME, IDataModel.ENABLE_CHG);
- }
- return super.propertySet(propertyName, propertyValue);
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (FACET_RUNTIME.equals(propertyName)) {
- if (getBooleanProperty(ADD_TO_EAR)) {
- IStatus status = validateEAR(model.getStringProperty(EAR_PROJECT_NAME));
- if (status.isOK()) {
- IProject earProject = ProjectUtilities.getProject(getStringProperty(EAR_PROJECT_NAME));
- if (earProject != null && earProject.exists()) {
- IFacetedProject facetdEarProject;
- try {
- facetdEarProject = ProjectFacetsManager.create(earProject);
- if (facetdEarProject != null) {
- return false;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- }
- }
- return true;
- }
- return super.isPropertyEnabled(propertyName);
- }
-
- public IStatus validate(String propertyName) {
- if( ADD_TO_EAR.equals(propertyName) || EAR_PROJECT_NAME.equals(propertyName) ){
- if( model.getBooleanProperty( ADD_TO_EAR )){
- IStatus status = validateEAR( model.getStringProperty( EAR_PROJECT_NAME ) );
- if (!status.isOK())
- return status;
- }
- else
- return OK_STATUS;
-
- }
- return super.validate(propertyName);
- }
-
- protected IStatus validateEAR(String earName) {
- if (earName == null || earName.equals("")) { //$NON-NLS-1$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- if (earName.indexOf("#") != -1 || earName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- return (ProjectCreationDataModelProviderNew.validateProjectName(earName));
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
deleted file mode 100644
index a58fbe9..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,67 +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.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class J2EEFacetRuntimeChangedDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 );
- }
-
- try
- {
- ClasspathHelper.removeClasspathEntries( project, fv );
-
- if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
- {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
deleted file mode 100644
index 0430099..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,226 +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.jst.j2ee.project.facet;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-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.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public abstract class J2EEModuleFacetInstallDataModelProvider extends J2EEFacetInstallDataModelProvider implements IJ2EEModuleFacetInstallDataModelProperties {
-
- /**
- * An internal Boolean property used to prohibit adding this module to an EAR. This is set on
- * the nested models when used during EAR creation since EAR creation handles adding to the EAR
- */
- public static final String PROHIBIT_ADD_TO_EAR = "J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR"; //$NON-NLS-1$
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(ADD_TO_EAR);
- names.add(PROHIBIT_ADD_TO_EAR);
- names.add(CONFIG_FOLDER);
- names.add(EAR_PROJECT_NAME);
- names.add(LAST_EAR_NAME);
- names.add(MODULE_URI);
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(PROHIBIT_ADD_TO_EAR)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(ADD_TO_EAR)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(EAR_PROJECT_NAME)) {
- if(model.isPropertySet(LAST_EAR_NAME)){
- IProject project = ProjectUtilities.getProject(getStringProperty(LAST_EAR_NAME));
- if( project.exists())
- return project.getName();
- }
- DataModelPropertyDescriptor[] descs = getValidPropertyDescriptors(EAR_PROJECT_NAME);
- if( descs.length > 0 ){
- DataModelPropertyDescriptor desc = descs[0];
- String eARName = desc.getPropertyDescription();
- if( eARName != null && !eARName.equals("")){ //$NON-NLS-1$
- return eARName;
- }else{
- return getDataModel().getStringProperty(FACET_PROJECT_NAME) + "EAR"; //$NON-NLS-1$
- }
- }else{
- return getDataModel().getStringProperty(FACET_PROJECT_NAME) + "EAR"; //$NON-NLS-1$
- }
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (propertyName.equals(PROHIBIT_ADD_TO_EAR)) {
- setBooleanProperty(ADD_TO_EAR, false);
- }
- if (ADD_TO_EAR.equals(propertyName)) {
- IStatus stat = model.validateProperty(propertyName);
- if (stat != OK_STATUS){
- return true;
- }
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- } else if (FACET_PROJECT_NAME.equals(propertyName)) {
- if (getBooleanProperty(ADD_TO_EAR)) {
- if (!model.isPropertySet(EAR_PROJECT_NAME)) {
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
- }
- }
- } else if (FACET_VERSION.equals(propertyName)) {
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- } else if (propertyName.equals(CONFIG_FOLDER)) {
- IDataModel masterModel = (IDataModel) model.getProperty(MASTER_PROJECT_DM);
- if (masterModel != null) {
- FacetDataModelMap map = (FacetDataModelMap) masterModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel javaModel = map.getFacetDataModel(IModuleConstants.JST_JAVA);
- if (javaModel != null)
- javaModel.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, propertyValue);
- }
- } else if (EAR_PROJECT_NAME.equals(propertyName)) {
- IStatus status = validateEAR(model.getStringProperty(EAR_PROJECT_NAME));
- if (status.isOK()) {
- IProject project = ProjectUtilities.getProject((String) propertyValue);
- if (project.exists() && project.isAccessible() && J2EEProjectUtilities.isEARProject(project)) {
- try {
- IFacetedProject facetProj = ProjectFacetsManager.create(project, false, new NullProgressMonitor());
- setProperty(FACET_RUNTIME, facetProj.getRuntime());
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }else if(LAST_EAR_NAME.equals(propertyName)){
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
- }else if(propertyName.equals(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)){
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- }
- return super.propertySet(propertyName, propertyValue);
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (ADD_TO_EAR.equals(propertyName)) {
- return !getBooleanProperty(PROHIBIT_ADD_TO_EAR) && isEARSupportedByRuntime();
- }
- if (EAR_PROJECT_NAME.equals(propertyName)) {
- return !getBooleanProperty(PROHIBIT_ADD_TO_EAR) && getBooleanProperty(ADD_TO_EAR);
- }
- return super.isPropertyEnabled(propertyName);
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (EAR_PROJECT_NAME.equals(propertyName)) {
- int j2eeVersion = getJ2EEVersion();
- return getEARPropertyDescriptors(j2eeVersion);
- }
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- protected DataModelPropertyDescriptor[] getEARPropertyDescriptors(int j2eeVersion) {
- StructureEdit mc = null;
- ArrayList earDescriptorList = new ArrayList();
-
- IProject[] projs = ProjectUtilities.getAllProjects();
-
- for (int index = 0; index < projs.length; index++) {
- IProject flexProject = projs[index];
- try {
- if (flexProject != null) {
- if (ModuleCoreNature.isFlexibleProject(flexProject)) {
- IVirtualComponent comp = ComponentCore.createComponent(flexProject);
- if (J2EEProjectUtilities.isEARProject(comp.getProject())) {
- String sVer = J2EEProjectUtilities.getJ2EEProjectVersion(comp.getProject());
- int ver = J2EEVersionUtil.convertVersionStringToInt(sVer);
- if (j2eeVersion <= ver) {
- DataModelPropertyDescriptor desc = new DataModelPropertyDescriptor(comp.getProject().getName());
- earDescriptorList.add(desc);
- }
- }
- }
- }
- } finally {
- if (mc != null)
- mc.dispose();
- }
- }
- DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[earDescriptorList.size()];
- for (int i = 0; i < descriptors.length; i++) {
- DataModelPropertyDescriptor desc = (DataModelPropertyDescriptor) earDescriptorList.get(i);
- descriptors[i] = new DataModelPropertyDescriptor(desc.getPropertyDescription(), desc.getPropertyDescription());
- }
- return descriptors;
- }
-
- public IStatus validate(String name) {
- if (name.equals(EAR_PROJECT_NAME) && getBooleanProperty(ADD_TO_EAR)) {
- IStatus status = validateEAR(getStringProperty(EAR_PROJECT_NAME));
- if (!status.isOK())
- return status;
- } else if (name.equals(CONFIG_FOLDER)) {
- String folderName = model.getStringProperty(CONFIG_FOLDER);
- if (folderName == null || folderName.length() == 0) {
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SOURCEFOLDER_EMPTY);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- }else if (name.equals(ADD_TO_EAR)){
- if( !isEARSupportedByRuntime()){
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_NOT_SUPPORTED);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- }
- return super.validate(name);
- }
-
- protected IStatus validateEAR(String earName) {
- if (earName.indexOf("#") != -1 || earName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- } else if (earName == null || earName.equals("")) { //$NON-NLS-1$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- return (ProjectCreationDataModelProviderNew.validateProjectName(earName));
- }
-
- private boolean isEARSupportedByRuntime(){
- boolean ret = true;
- IRuntime rt = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- if( rt != null )
- ret = rt.supports(EARFacetUtils.EAR_FACET);
- return ret;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHandler.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHandler.java
deleted file mode 100644
index d99420ee..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHandler.java
+++ /dev/null
@@ -1,31 +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
- *******************************************************************************/
-/*
- * Created on Jun 9, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface J2EEModulePostImportHandler {
-
- public void moduleImported(IProject moduleProject);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHelper.java
deleted file mode 100644
index 1f83987..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHelper.java
+++ /dev/null
@@ -1,158 +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
- *******************************************************************************/
-/*
- * Created on Jun 9, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class J2EEModulePostImportHelper {
-
- private static final String WEB = J2EEPluginResourceHandler.J2EEModulePostImportHelper_0;
- private static final String EJB = J2EEPluginResourceHandler.J2EEModulePostImportHelper_1;
- private static final String APP_CLIENT = J2EEPluginResourceHandler.J2EEModulePostImportHelper_2;
- private static final String CONNECTOR = J2EEPluginResourceHandler.J2EEModulePostImportHelper_3;
-
- private static IConfigurationElement[] webExtensions = null;
- private static IConfigurationElement[] ejbExtensions = null;
- private static IConfigurationElement[] appClientExtensions = null;
- private static IConfigurationElement[] connectorExtensions = null;
-
- private static boolean firstTimeLoading = true;
-
- public static void notifyWebExtensions(IProject project) {
- if (webExtensions == null) {
- loadConfiguration(WEB);
- }
- notifyExtensions(webExtensions, project);
- }
-
- public static void notifyEjbExtensions(IProject project) {
- if (ejbExtensions == null) {
- loadConfiguration(EJB);
- }
- notifyExtensions(ejbExtensions, project);
- }
-
- public static void notifyAppClientExtensions(IProject project) {
- if (appClientExtensions == null) {
- loadConfiguration(APP_CLIENT);
- }
- notifyExtensions(appClientExtensions, project);
- }
-
- public static void notifyConnectorExtensions(IProject project) {
- if (connectorExtensions == null) {
- loadConfiguration(CONNECTOR);
- }
- notifyExtensions(connectorExtensions, project);
- }
-
- private static void notifyExtensions(IConfigurationElement[] postImportElement, IProject project) {
- for (int i = 0; i < postImportElement.length; i++) {
- try {
- J2EEModulePostImportHandler postCreate = (J2EEModulePostImportHandler) postImportElement[i].createExecutableExtension("className"); //$NON-NLS-1$
- postCreate.moduleImported(project);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- }
-
- private static void loadConfiguration(final String loadingModuleType) {
- boolean shouldLogErrors = firstTimeLoading;
- firstTimeLoading = false;
-
- IExtension[] importExtensions =Platform.getExtensionRegistry().getExtensionPoint("J2EEModulePostImport").getExtensions(); //$NON-NLS-1$
-
- ArrayList interestedExtensions = new ArrayList();
- for (int i = 0; i < importExtensions.length; i++) {
- IExtension extension = importExtensions[i];
- IConfigurationElement[] configElements = extension.getConfigurationElements();
- boolean isExtensionInterested = false;
- IConfigurationElement postImportElement = null;
- int moduleCount = 0;
- for (int j = 0; j < configElements.length; j++) {
- try {
- IConfigurationElement element = configElements[j];
- if (element.getName().equalsIgnoreCase("postImport")) { //$NON-NLS-1$
- postImportElement = element;
- } else if (element.getName().equalsIgnoreCase(("module"))) { //$NON-NLS-1$
- moduleCount++;
- if (!isExtensionInterested) {
- String moduleType = element.getAttribute("type"); //$NON-NLS-1$
- if (WEB == loadingModuleType && WEB.equalsIgnoreCase(moduleType)) {
- isExtensionInterested = true;
- } else if (EJB == loadingModuleType && EJB.equalsIgnoreCase(moduleType)) {
- isExtensionInterested = true;
- } else if (APP_CLIENT == loadingModuleType && APP_CLIENT.equalsIgnoreCase(moduleType)) {
- isExtensionInterested = true;
- } else if (CONNECTOR == loadingModuleType && CONNECTOR.equalsIgnoreCase(moduleType)) {
- isExtensionInterested = true;
- }
- }
- }
- } catch (Exception e) {
- if (shouldLogErrors) {
- e.printStackTrace();
- }
- }
- }
-
- //if no module types are defined the default is to listen to all of them.
- if (!isExtensionInterested && 0 == moduleCount) {
- isExtensionInterested = true;
- }
-
- if (isExtensionInterested) {
- try {
- //try instantiating the class before adding it to the list.
- postImportElement.createExecutableExtension("className"); //$NON-NLS-1$
- interestedExtensions.add(postImportElement);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- IConfigurationElement[] configElements = new IConfigurationElement[interestedExtensions.size()];
- for (int i = 0; i < configElements.length; i++) {
- configElements[i] = (IConfigurationElement) interestedExtensions.get(i);
- }
- if (WEB == loadingModuleType) {
- webExtensions = configElements;
- } else if (EJB == loadingModuleType) {
- ejbExtensions = configElements;
- } else if (APP_CLIENT == loadingModuleType) {
- appClientExtensions = configElements;
- } else if (CONNECTOR == loadingModuleType) {
- connectorExtensions = configElements;
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/ResourceTypeReaderHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/ResourceTypeReaderHelper.java
deleted file mode 100644
index f285040..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/ResourceTypeReaderHelper.java
+++ /dev/null
@@ -1,174 +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
- *******************************************************************************/
-/*
- * Created on 10-Oct-03
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @author sapnam
- *
- * This helper class was created for ResourceRefTypeReader and ResourceEnvRefTypeReader to read all
- * valid types from extensions of each and to return a array of String to populate the Ref 'Type'
- * fields.
- */
-public class ResourceTypeReaderHelper {
- private static String extensionPoint;
- private static String typeAttributeName;
- private static final String USAGE_TYPE = "type"; //$NON-NLS-1$
- private static final String USAGE_ATTRIBUTE_NAME = "usage"; //$NON-NLS-1$
- private static final String USAGE_COMMON = "Common"; //$NON-NLS-1$
- private static final String USAGE_EJB = "EJB Jar"; //$NON-NLS-1$
- private static final String SERVER_TARGET_IDS_ATTRIBUTE_NAME = "target-server-ids"; //$NON-NLS-1$
- private static final String SERVER_TARGET_IDS_SEPARATOR = ","; //$NON-NLS-1$
- private boolean isEJBJar;
-
- public static final int RESOURCE_REF = 0;
- public static final int RESOURCE_ENV_REF = 1;
-
- private static final String[] EXTENSION_POINTS = {"org.eclipse.jst.j2ee.resourceRefType", "org.eclipse.jst.j2ee.resourceEnvRefType"};//$NON-NLS-1$ //$NON-NLS-2$
-
- public static String[] getAllReferences(int refType, String serverTargetID, boolean isEJBJar, String[] baseItems) {
- String extensionPointLocal = EXTENSION_POINTS[refType];
- ResourceTypeReaderHelper reader = new ResourceTypeReaderHelper(extensionPointLocal, USAGE_TYPE, isEJBJar);
- String[] extendedItems = null == serverTargetID ? reader.getResTypes() : reader.getResTypes(serverTargetID);
- String[] allItems = null;
- if (null == extendedItems || 0 == extendedItems.length) {
- allItems = baseItems;
- } else {
- allItems = new String[baseItems.length + extendedItems.length];
- System.arraycopy(baseItems, 0, allItems, 0, baseItems.length);
- System.arraycopy(extendedItems, 0, allItems, baseItems.length, extendedItems.length);
- }
- Arrays.sort(allItems);
- return allItems;
- }
-
-
- private ResourceTypeReaderHelper(String extPoint, String typeAttName, boolean ejbJar) {
- extensionPoint = extPoint;
- typeAttributeName = typeAttName;
- isEJBJar = ejbJar;
- }
-
- private IExtensionPoint getExtensionPoint() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint exPoint = registry.getExtensionPoint(extensionPoint);
- return exPoint;
- }
-
- private ArrayList processExtensions() {
- IExtension[] allExtensions = getExtensionPoint().getExtensions();
- ArrayList tempTypes = new ArrayList();
- for (int x = 0; x < allExtensions.length; ++x) {
- IExtension config = allExtensions[x];
- IConfigurationElement[] cElems = config.getConfigurationElements();
- for (int i = 0; i < cElems.length; i++) {
- if (getValidTypes(cElems[i]) != null) {
- tempTypes.add(getValidTypes(cElems[i]));
- }
- }
- }
- return tempTypes;
- }
-
-
- /**
- * @return an array of string containing valid Resource Ref or Resource Env Ref types.
- */
- public String[] getResTypes() {
- ArrayList types = processExtensions();
- String[] allTypes = new String[types.size()];
- for (int z = 0; z < types.size(); z++) {
- allTypes[z] = (String) types.get(z);
- }
- return allTypes;
- }
-
- private ArrayList processExtensions(String targetServer) {
- IExtension[] allExtensions = getExtensionPoint().getExtensions();
- ArrayList tempTypes = new ArrayList();
- for (int x = 0; x < allExtensions.length; ++x) {
- IExtension config = allExtensions[x];
- IConfigurationElement[] cElems = config.getConfigurationElements();
- for (int i = 0; i < cElems.length; i++) {
- if (getValidTypes(cElems[i], targetServer) != null) {
- tempTypes.add(getValidTypes(cElems[i], targetServer));
- }
- }
- }
- return tempTypes;
- }
-
- /**
- * @param element
- * A configuration element.
- * @return A valid Type
- */
- private Object getValidTypes(IConfigurationElement element, String targetServer) {
- String elementServerIDs = element.getAttribute(SERVER_TARGET_IDS_ATTRIBUTE_NAME);
- if (null == elementServerIDs || isValidTargeted(elementServerIDs, targetServer)) {
- String usage = element.getAttribute(USAGE_ATTRIBUTE_NAME);
- if (usage.equals(USAGE_COMMON)) {
- return element.getAttribute(typeAttributeName);
- } else if (isEJBJar && usage.equals(USAGE_EJB)) {
- return element.getAttribute(typeAttributeName);
- }
- }
- return null;
- }
-
- /**
- * @param element
- * A configuration element.
- * @return A valid Type
- */
- private Object getValidTypes(IConfigurationElement element) {
- return getValidTypes(element, null);
- }
-
- /**
- * @return an array of string containing valid Resource Ref or Resource Env Ref types.
- */
- public String[] getResTypes(String targetServer) {
- ArrayList types = processExtensions(targetServer);
- String[] allTypes = new String[types.size()];
- for (int z = 0; z < types.size(); z++) {
- allTypes[z] = (String) types.get(z);
- }
- return allTypes;
- }
-
- private boolean isValidTargeted(String attribute, String targetServerId) {
- if (attribute == null || targetServerId == null)
- return false;
- if (attribute.trim().equalsIgnoreCase(targetServerId.trim()))
- return true;
- if (attribute.indexOf(targetServerId.trim() + SERVER_TARGET_IDS_SEPARATOR) >= 0)
- return true;
- if (attribute.trim().length() > (targetServerId.trim().length() + 1) && attribute.substring(attribute.trim().length() - targetServerId.length()).equalsIgnoreCase(targetServerId.trim()))
- return true;
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistry.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistry.java
deleted file mode 100644
index f42f487..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistry.java
+++ /dev/null
@@ -1,184 +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
- *******************************************************************************/
-/*
- * Created on Mar 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.deploy;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class DeployerRegistry {
- /**
- *
- */
- private static DeployerRegistry INSTANCE;
- private HashMap deployModuleExtensions = new HashMap();
-
- public DeployerRegistry() {
- super();
- }
-
- /**
- * @param deployer
- * @param serverTarget
- * @param natureID
- */
- public void register(IConfigurationElement deployer, List serverTargets, List natures) {
- HashMap targetDeployers;
- for (Iterator iter = natures.iterator(); iter.hasNext();) {
- String natureID = (String) iter.next();
- for (Iterator iterator = serverTargets.iterator(); iterator.hasNext();) {
- String runtimeID = (String) iterator.next();
- targetDeployers = getDeployModuleExtensions(natureID);
- getTargetDeployers(targetDeployers, runtimeID).add(deployer);
- }
- }
- }
-
- private List getDeployers(String natureID, String serverTarget) {
- HashMap targetDeployers = getDeployModuleExtensions(natureID);
- return getTargetDeployers(targetDeployers, serverTarget);
- }
-
- public static DeployerRegistry instance() {
- if (INSTANCE == null) {
- INSTANCE = new DeployerRegistry();
- readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- *
- */
- private static void readRegistry() {
- DeployerRegistryReader reader = new DeployerRegistryReader();
- reader.readRegistry();
- }
-
- /**
- * @return
- */
- public static List getSelectedModules(Object[] mySelections) {
- List modules = new ArrayList();
- for (int i = 0; i < mySelections.length; i++) {
- Object object = mySelections[i];
- if (object instanceof EObject) {
- object = ProjectUtilities.getProject(object);
- }
- if (object instanceof IProject) {
- IVirtualComponent component = ComponentCore.createComponent((IProject)object);
- EnterpriseArtifactEdit edit = null;
- try {
- edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(component);
- if (edit == null)
- continue;
- EObject root = edit.getDeploymentDescriptorRoot();
- if (root == null || modules.contains(root))
- continue;
- // Order Ears first...
- if (J2EEProjectUtilities.isEARProject(component.getProject()))
- modules.add(0, root);
- else
- modules.add(root);
- } finally {
- if (edit != null)
- edit.dispose();
- }
- }
- }
- return modules;
- }
-
- /**
- * @param targetDeployers
- * @param serverTarget
- */
- private List getTargetDeployers(HashMap targetDeployers, String serverTarget) {
- if (targetDeployers.get(serverTarget) == null)
- targetDeployers.put(serverTarget, new ArrayList());
- return (List) targetDeployers.get(serverTarget);
- }
-
- /**
- * @param natureID
- * @return
- */
- private HashMap getDeployModuleExtensions(String natureID) {
- if (getDeployModuleExtensions().get(natureID) == null)
- getDeployModuleExtensions().put(natureID, new HashMap());
- return (HashMap) getDeployModuleExtensions().get(natureID);
- }
-
- /**
- * @return Returns the deployExtensions.
- */
- public HashMap getDeployModuleExtensions() {
- return deployModuleExtensions;
- }
-
- /**
- * @param deployExtensions
- * The deployExtensions to set.
- */
- public void setDeployModuleExtensions(HashMap deployExtensions) {
- this.deployModuleExtensions = deployExtensions;
- }
-
- /**
- * @param module
- * @param runtime
- * @return
- */
- public List getDeployModuleExtensions(EObject module, IRuntime runtime) {
- IVirtualComponent comp = ComponentUtilities.findComponent(module);
- String typeID = ""; //$NON-NLS-1$
- if (J2EEProjectUtilities.isEARProject(comp.getProject()))
- typeID = J2EEProjectUtilities.ENTERPRISE_APPLICATION;
- else if (J2EEProjectUtilities.isApplicationClientProject(comp.getProject()))
- typeID = J2EEProjectUtilities.APPLICATION_CLIENT;
- else if (J2EEProjectUtilities.isDynamicWebProject(comp.getProject()))
- typeID = J2EEProjectUtilities.DYNAMIC_WEB;
- else if (J2EEProjectUtilities.isStaticWebProject(comp.getProject()))
- typeID = J2EEProjectUtilities.STATIC_WEB;
- else if (J2EEProjectUtilities.isEJBProject(comp.getProject()))
- typeID = J2EEProjectUtilities.EJB;
- else if (J2EEProjectUtilities.isJCAProject(comp.getProject()))
- typeID = J2EEProjectUtilities.JCA;
- else if (J2EEProjectUtilities.isUtilityProject(comp.getProject()))
- typeID = J2EEProjectUtilities.UTILITY;
- String runtimeID = runtime.getRuntimeType().getId();
- return getDeployers(typeID, runtimeID);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java
deleted file mode 100644
index d91f732..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java
+++ /dev/null
@@ -1,89 +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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.deploy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class DeployerRegistryReader extends RegistryReader {
- /**
- * @param registry
- * @param plugin
- * @param extensionPoint
- */
- static final String J2EE_DEPLOYER_EXTENSION_POINT = "DeployerExtension"; //$NON-NLS-1$
- static final String TARGET_SERVER_RUNTIME_ID = "runtime_server_id"; //$NON-NLS-1$
- static final String RUNTIME = "runtime"; //$NON-NLS-1$
- static final String DEPLOYER = "deployer"; //$NON-NLS-1$
- public static final String DEPLOYER_CLASS = "deployer_class"; //$NON-NLS-1$
- static final String MODULE_TYPE_NATURE_ID = "module_nature_id"; //$NON-NLS-1$
- static final String NATURE = "nature"; //$NON-NLS-1$
- static final String COMPONENT_TYPE_ID = "component_type"; //$NON-NLS-1$
- static final String COMPONENT = "component"; //$NON-NLS-1$
-
- public DeployerRegistryReader() {
- super(J2EEPlugin.PLUGIN_ID, J2EE_DEPLOYER_EXTENSION_POINT);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(DEPLOYER))
- return false;
- List runtimeList = new ArrayList();
- List natureandcomponents = new ArrayList();
- IConfigurationElement[] runtimes = element.getChildren(RUNTIME);
- for (int i = 0; i < runtimes.length; i++) {
- IConfigurationElement runtime = runtimes[i];
- String serverTarget = runtime.getAttribute(TARGET_SERVER_RUNTIME_ID);
- runtimeList.add(serverTarget);
- }
- IConfigurationElement[] natures = element.getChildren(NATURE);
- for (int i = 0; i < natures.length; i++) {
- IConfigurationElement nature = natures[i];
- String natureID = nature.getAttribute(MODULE_TYPE_NATURE_ID);
- natureandcomponents.add(natureID);
- }
- IConfigurationElement[] components = element.getChildren(COMPONENT);
- for (int i = 0; i < components.length; i++) {
- IConfigurationElement component = components[i];
- String compType = component.getAttribute(COMPONENT_TYPE_ID);
- natureandcomponents.add(compType);
- }
-
- String deployer = element.getAttribute(DEPLOYER_CLASS);
- if (deployer != null) {
- DeployerRegistry.instance().register(element, runtimeList, natureandcomponents);
- return true;
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/FatalDeployerException.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/FatalDeployerException.java
deleted file mode 100644
index 8d410b3..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/FatalDeployerException.java
+++ /dev/null
@@ -1,63 +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
- *******************************************************************************/
-/*
- * Created on Mar 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.deploy;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class FatalDeployerException extends Exception {
- /**
- * Warning clean-up 12/05/2005
- */
- private static final long serialVersionUID = -7991505439979201757L;
-
- /**
- *
- */
- public FatalDeployerException() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param message
- */
- public FatalDeployerException(String message) {
- super(message);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param message
- * @param cause
- */
- public FatalDeployerException(String message, Throwable cause) {
- super(message, cause);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param cause
- */
- public FatalDeployerException(Throwable cause) {
- super(cause);
- // TODO Auto-generated constructor stub
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployHelper.java
deleted file mode 100644
index 2168ead..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployHelper.java
+++ /dev/null
@@ -1,145 +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
- *******************************************************************************/
-/*
- * Created on Aug 4, 2004
- */
-package org.eclipse.jst.j2ee.internal.deploy;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emf.utilities.ICommandContext;
-
-/**
- * @author cbridgha
- *
- */
-public class J2EEDeployHelper {
-
- /**
- * @param resource
- * @param context
- * @returns first EJBJar found in the project
- */
- public static EJBJar getEJBJar(IResource resource, ICommandContext context) {
- EnterpriseArtifactEdit edit = null;
- try {
- if (resource instanceof IProject) {
- IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
- if (J2EEProjectUtilities.isEJBProject(comp.getProject())) {
- edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
- return (EJBJar)edit.getDeploymentDescriptorRoot();
- }
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return null;
- }
-
- /**
- * @param resource
- * @param context
- * @return
- */
- public static Application getApplication(IResource resource, ICommandContext context) {
- EnterpriseArtifactEdit edit = null;
- try {
- if (resource instanceof IProject) {
- IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
- if (J2EEProjectUtilities.isEARProject(comp.getProject())) {
- edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
- return (Application)edit.getDeploymentDescriptorRoot();
- }
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return null;
- }
-
- /**
- * @param resource
- * @param context
- * @return
- */
- public static ApplicationClient getAppClient(IResource resource, ICommandContext context) {
- EnterpriseArtifactEdit edit = null;
- try {
- if (resource instanceof IProject) {
- IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
- if (J2EEProjectUtilities.isApplicationClientProject(comp.getProject())) {
- edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
- return (ApplicationClient)edit.getDeploymentDescriptorRoot();
- }
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return null;
- }
-
- /**
- * @param resource
- * @param context
- * @return
- */
- public static WebApp getWebApp(IResource resource, ICommandContext context) {
- EnterpriseArtifactEdit edit = null;
- try {
- if (resource instanceof IProject) {
- IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
- if (J2EEProjectUtilities.isDynamicWebProject(comp.getProject())) {
- edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
- return (WebApp)edit.getDeploymentDescriptorRoot();
- }
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return null;
- }
-
- /**
- * @param resource
- * @param context
- * @return
- */
- public static Connector getConnector(IResource resource, ICommandContext context) {
- EnterpriseArtifactEdit edit = null;
- try {
- if (resource instanceof IProject) {
- IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
- if (J2EEProjectUtilities.isJCAProject(comp.getProject())) {
- edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
- return (Connector)edit.getDeploymentDescriptorRoot();
- }
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java
deleted file mode 100644
index 82d90ba..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java
+++ /dev/null
@@ -1,240 +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
- *******************************************************************************/
-/*
- * Created on Apr 1, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.deploy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-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.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.utilities.CommandContext;
-import org.eclipse.wst.common.internal.emf.utilities.ICommand;
-import org.eclipse.wst.common.internal.emf.utilities.ICommandContext;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEDeployOperation extends AbstractDataModelOperation {
-
- private Object[] selection;
- private IStatus multiStatus;
- private IProject currentProject;
-
- /**
- *
- */
- public J2EEDeployOperation(Object[] deployableObjects) {
- super();
- selection = deployableObjects;
- // TODO Auto-generated constructor stub
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
- return null;
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- DeployerRegistry reg = DeployerRegistry.instance();
- List modules = getSelectedModules(selection);
- monitor.beginTask(J2EEPluginResourceHandler.J2EEDeployOperation_UI_0, modules.size());
- for (int i = 0; i < modules.size(); i++) {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = (EnterpriseArtifactEdit) modules.get(i);
- EObject module = edit.getDeploymentDescriptorRoot();
- IProject proj = ProjectUtilities.getProject(module);
- IRuntime runtime = null;
- try {
- runtime = J2EEProjectUtilities.getServerRuntime(proj);
- }
- catch (CoreException e) {
- J2EEPlugin.getDefault().getLog().log(e.getStatus());
- }
- if (runtime == null)
- continue;
- List visitors = reg.getDeployModuleExtensions(module, runtime);
- deploy(visitors, module, monitor);
- monitor.worked(1);
- } finally {
- if (edit != null)
- edit.dispose();
- }
- }
- return getMultiStatus();
- }
-
- /**
- * @param visitors
- * @param module
- */
- private void deploy(List visitors, EObject module, IProgressMonitor monitor) {
- IProject proj = ProjectUtilities.getProject(module);
- for (int i = 0; i < visitors.size(); i++) {
- if (!(visitors.get(i) instanceof IConfigurationElement))
- continue;
- ICommand dep = null;
- try {
- dep = (ICommand) ((IConfigurationElement) visitors.get(i)).createExecutableExtension(DeployerRegistryReader.DEPLOYER_CLASS);
- } catch (Exception e) {
- e.printStackTrace();
- continue;
- }
- ICommandContext ctx = new CommandContext(monitor, null, module.eResource().getResourceSet());
- if (dep == null) continue;
- dep.init(selection);
-
- monitor.setTaskName(J2EEPluginResourceHandler.getString(J2EEPluginResourceHandler.J2EEDeployOperation_1_UI_, new Object[]{proj.getName(), dep.getClass().getName()}));
- try {
- dep.execute(proj, null, ctx);
- addOKStatus(dep.getClass().getName());
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- monitor.setCanceled(true);
- Throwable statusException = (ex.getStatus().getException() != null) ? ex.getStatus().getException() : ex;
- addErrorStatus(ex.getStatus(), dep.getClass().getName(), statusException);
- continue;
- }
- }
- }
-
- /**
- * @param proj
- * @param name
- */
- private void addOKStatus(String DeployerName) {
-
- IStatus statusLocal = new Status(IStatus.OK, " ", IStatus.OK, (J2EEPluginResourceHandler.getString("J2EEDeployOperation_2_UI_", new Object[]{DeployerName})), null); //$NON-NLS-1$ //$NON-NLS-2$
- //TODO
- getMultiStatus().add(statusLocal);
-
- }
-
- /**
- * @param exceptionStatus
- * @param proj
- * @param name
- */
- private void addErrorStatus(IStatus exceptionStatus, String DeployerName, Throwable ex) {
-
- Throwable mainCause = null;
- if (exceptionStatus instanceof MultiStatus) {
- IStatus[] stati = ((MultiStatus) exceptionStatus).getChildren();
- for (int i = 0; 1 < stati.length; i++) {
- addErrorStatus(stati[i], DeployerName, stati[i].getException());
- }
- }
- mainCause = (ex.getCause() != null) ? ex.getCause() : ex;
-
- //String errorNotes = (mainCause != null && mainCause.getMessage() != null) ? mainCause.getMessage() : "";
-
- String message = J2EEPluginResourceHandler.bind(J2EEPluginResourceHandler.J2EEDeployOperation_3_UI_,DeployerName, ""); //$NON-NLS-1$
- IStatus statusLocal = new Status(IStatus.ERROR, J2EEPlugin.getPlugin().getPluginID(), IStatus.ERROR, message, mainCause); //$NON-NLS-1$
- getMultiStatus().add(statusLocal);
-
-
-
- }
-
- private IStatus getMainStatus(IProject proj) {
-
- IStatus aStatus = new MultiStatus(J2EEPlugin.getPlugin().getPluginID(), IStatus.OK, J2EEPluginResourceHandler.getString(J2EEPluginResourceHandler.J2EEDeployOperation_4_UI_, new Object[]{proj.getName()}), null);
-
- return aStatus;
- }
-
- /**
- * @return Returns the multiStatus.
- */
- public MultiStatus getMultiStatus() {
- if (multiStatus == null)
- multiStatus = getMainStatus(currentProject);
- return (MultiStatus)multiStatus;
- }
-
- /**
- * @param multiStatus
- * The multiStatus to set.
- */
- public void setMultiStatus(IStatus newStatus) {
- this.multiStatus = newStatus;
- }
-
- protected List getSelectedModules(Object[] mySelections) {
- List modules = new ArrayList();
- List components = new ArrayList();
- for (int i = 0; i < mySelections.length; i++) {
- Object object = mySelections[i];
- if (object instanceof EObject) {
- object = ProjectUtilities.getProject(object);
- currentProject = (IProject)object;
- }
- if (object instanceof IProject) {
- currentProject = (IProject)object;
- IVirtualComponent component = ComponentCore.createComponent((IProject)object);
- EnterpriseArtifactEdit edit = null;
- edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(component);
- if (components.contains(edit)) {
- if (edit != null)
- edit.dispose();
- continue;
- }
- // Order Ears first...
- if (J2EEProjectUtilities.isEARProject(component.getProject())) {
- modules.add(0, edit);
- components.add(0,component);
- }
- else {
- modules.add(edit);
- components.add(component);
- }
- }
- }
- return modules;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployer.java
deleted file mode 100644
index b6ad428..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployer.java
+++ /dev/null
@@ -1,58 +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.jst.j2ee.internal.deploy;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/*
- * Deployer interface for the J2EEDeploymentFramework
- */
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- * @deprecated - Change to use the org.eclipse.wst.common.emf.utilities.ICommand interface
- */
-public interface J2EEDeployer {
- /*
- * This will contain the multi-selection of objects to deploy. This selection could be used to
- * filter elements within a Module. Any other setup code should be done here...
- */
- void init(Object[] selection);
-
- /*
- * This will visit each extension's deploy operation on the deployable object. A Multi-Status
- * should be returned
- */
- IStatus visit(EJBJar deployable) throws FatalDeployerException;
-
- IStatus visit(ApplicationClient deployable) throws FatalDeployerException;
-
- IStatus visit(Application deployable) throws FatalDeployerException;
-
- IStatus visit(WebApp deployable) throws FatalDeployerException;
-
- IStatus visit(Connector deployable) throws FatalDeployerException;
-
- /*
- * Any cleanup should be done here...
- */
- void finish();
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
deleted file mode 100644
index f1467a2..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
+++ /dev/null
@@ -1,208 +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.jst.j2ee.internal.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-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.NullModuleArtifact;
-
-/**
- * Creates the Object adapter for ear projects.
- */
-public class EnterpriseApplicationDeployableAdapterUtil {
-
- /**
- * Constructor for EnterpriseApplicationDeployableObjectAdapter.
- */
- public EnterpriseApplicationDeployableAdapterUtil() {
- super();
- }// EnterpriseApplicationDeployableObjectAdapter
-
- /**
- * Gets the object for a type of object.
- *
- * @param Object
- * obj - Object to adapt.
- */
- public static IModuleArtifact getModuleObject(Object obj) {
- if (obj instanceof Application)
- return getModuleObject((Application) obj);
- if (obj instanceof IProject)
- return getModuleObject((IProject) obj);
- if (obj instanceof IFile)
- return getModuleObject((IFile) obj);
- return null;
- }// getDeployableObject
-
- /**
- * Gets the deployable object for ear instance.
- *
- * @param Application
- * application - EAR instance.
- */
- protected static IModuleArtifact getModuleObject(Application application) {
- IModule dep = getModule(application);
- return createModuleObject(dep);
- }// getDeployableObject
-
- /**
- * Gets the deployable object for project instances.
- *
- * @param IProject
- * project - Project instance.
- * @return IModuleObject
- */
- protected static IModuleArtifact getModuleObject(IProject project) {
- IModule dep = getModule(project,null);
- return createModuleObject(dep);
- }// getModuleObject
-
- /**
- * Gets the deployable object for file instances.
- *
- * @param IFile
- * file - File instance.
- * @return IModuleObject
- */
- protected static IModuleArtifact getModuleObject(IFile file) {
- if (file.getProjectRelativePath().toString().endsWith(J2EEConstants.APPLICATION_DD_URI)) {
- {
- IVirtualResource[] resources = ComponentCore.createResources(file);
- IVirtualComponent component = null;
- if (resources[0] != null || resources.length <= 0)
- component = resources[0].getComponent();
- return createModuleObject(getModule(file.getProject(), component));
- }
- }// if
- return null;
- }// getModuleObject
-
- /**
- * Gets the deployable object.
- *
- * @param EObject
- * refObject - The current refObject.
- * @return IModule
- */
- protected static IModule getModule(EObject refObject) {
- IProject proj = ProjectUtilities.getProject(refObject);
- Resource servResource = refObject.eResource();
- IVirtualResource[] resources = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- } catch (Exception e) {
- e.printStackTrace();
- }
- IVirtualComponent component = null;
- if (resources[0] != null)
- component = resources[0].getComponent();
- return getModule(proj,component);
- }// getModule
-
-
-
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- IModule deployable = null;
- Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.ENTERPRISE_APPLICATION)).iterator();
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- else
- return getModuleProject(project, iterator);
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getName().equals(componentName)) {
- return deployable;
- }
- }
- }
- return null;
- }
-
- /**
- * Creates the deployable object.
- *
- * @param IModuleObject
- * deployable - The current module object.
- */
- protected static IModuleArtifact createModuleObject(IModule module) {
-
- if (module != null) {
- return new NullModuleArtifact(module);
- }
-
- return null;
- }// createDeployableObject
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getId()
- */
- public String getId() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getObjectClassName()
- */
- public String getObjectClassName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#isPluginActivated()
- */
- public boolean isPluginActivated() {
- // TODO Auto-generated method stub
- return false;
- }
-
-}// EnterpriseApplicationDeployableObjectAdapter
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/FlexibleProjectServerUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/FlexibleProjectServerUtil.java
deleted file mode 100644
index 8330be3..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/FlexibleProjectServerUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class FlexibleProjectServerUtil {
-
- public static IJ2EEModule getModuleDelegate(WorkbenchComponent component) {
- IModule module = getModule(component);
- return getModuleDelegate(module);
- }
-
- public static IModule getModule(IProject project) {
- return ServerUtil.getModule(project);
- }
-
- public static IJ2EEModule getModuleDelegate(IModule module) {
- return (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- }
-
- public static IModule getModule(WorkbenchComponent component) {
- return getModule(StructureEdit.getContainingProject(component));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
deleted file mode 100644
index 5c5da28..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
+++ /dev/null
@@ -1,100 +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.jst.j2ee.internal.deployables;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-
-/**
- * J2EE module factory.
- */
-public class J2EEDeployableFactory extends ProjectModuleFactoryDelegate {
- protected Map moduleDelegates = new HashMap(5);
-
- public J2EEDeployableFactory() {
- super();
- }
-
- protected IModule createModule(IProject project) {
- try {
- ModuleCoreNature nature = (ModuleCoreNature) project.getNature(IModuleConstants.MODULE_NATURE_ID);
- if (nature != null)
- return createModule(nature);
- } catch (CoreException e) {
- Logger.getLogger().write(e);
- }
- return null;
- }
-
- protected IModule createModule(ModuleCoreNature nature) {
- IProject project = nature.getProject();
- try {
- IVirtualComponent comp = ComponentCore.createComponent(project);
- return createModuleDelegates(comp);
- } catch (Exception e) {
- Logger.getLogger().write(e);
- }
- return null;
- }
-
- public ModuleDelegate getModuleDelegate(IModule module) {
- return (ModuleDelegate) moduleDelegates.get(module);
- }
-
- protected IModule createModuleDelegates(IVirtualComponent component) {
- try {
- String type = J2EEProjectUtilities.getJ2EEProjectType(component.getProject());
- if (type != null && !type.equals("")) {
- String version = J2EEProjectUtilities.getJ2EEProjectVersion(component.getProject());
- IModule module = createModule(component.getDeployedName(), component.getDeployedName(), type, version, component.getProject());
- J2EEFlexProjDeployable moduleDelegate = new J2EEFlexProjDeployable(component.getProject(), component);
- moduleDelegates.put(module, moduleDelegate);
- return module;
- }
- } catch (Exception e) {
- Logger.getLogger().write(e);
- }
- return null;
- }
-
- /**
- * 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
- */
- protected IPath[] getListenerPaths() {
- return new IPath[] {
- new Path(".project"), // nature
- new Path(".settings/.component"), // component
- new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets
- };
- }
-
- protected void clearCache() {
- moduleDelegates = new HashMap(5);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
deleted file mode 100644
index 4bd4f05..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
+++ /dev/null
@@ -1,409 +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.jst.j2ee.internal.deployables;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-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.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.server.core.IApplicationClientModule;
-import org.eclipse.jst.server.core.IConnectorModule;
-import org.eclipse.jst.server.core.IEJBModule;
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-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.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.internal.ModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.web.internal.deployables.ComponentDeployable;
-/**
- * J2EE module superclass.
- */
-public class J2EEFlexProjDeployable extends ComponentDeployable implements IJ2EEModule, IEnterpriseApplication, IApplicationClientModule, IConnectorModule, IEJBModule, IWebModule {
- private static final IPath WEB_CLASSES_PATH = new Path("WEB-INF").append("classes"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * Constructor for J2EEFlexProjDeployable.
- *
- * @param project
- * @param aComponent
- * @deprecated use J2EEFlexProjDeployable(IProject project)
- */
- public J2EEFlexProjDeployable(IProject project, IVirtualComponent aComponent) {
- super(project);
- }
-
-
- /**
- * Constructor for J2EEFlexProjDeployable.
- *
- * @param project
- */
- public J2EEFlexProjDeployable(IProject project) {
- super(project);
- }
-
- /**
- * Returns the root folders for the resources in this module.
- *
- * @return a possibly-empty array of resource folders
- */
- public IContainer[] getResourceFolders() {
- List result = new ArrayList();
- IVirtualComponent vc = ComponentCore.createComponent(getProject());
- if (vc != null) {
- IVirtualFolder vFolder = vc.getRootFolder();
- if (vFolder != null) {
- IContainer[] underlyingFolders = vFolder.getUnderlyingFolders();
- result.addAll(Arrays.asList(underlyingFolders));
- }
- }
- return (IContainer[]) result.toArray(new IContainer[result.size()]);
- }
-
- /**
- * Returns the root folders containing Java output in this module.
- *
- * @return a possibly-empty array of Java output folders
- */
- public IContainer[] getJavaOutputFolders() {
- return getJavaOutputFolders(getProject());
- }
-
- public IContainer[] getJavaOutputFolders(IProject project) {
- if (project == null)
- return new IContainer[0];
- return J2EEProjectUtilities.getOutputContainers(project);
- }
-
- public IModuleResource[] members() throws CoreException {
- members.clear();
- IPath javaPath = Path.EMPTY;
- if (J2EEProjectUtilities.isDynamicWebProject(component.getProject()))
- javaPath = WEB_CLASSES_PATH;
-
- 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++) {
- if (!members.contains(mr[j]))
- members.add(mr[j]);
- }
- }
-
- IContainer[] javaCont = getJavaOutputFolders();
- int size = javaCont.length;
- for (int i = 0; i < size; i++) {
- IModuleResource[] mr = getMembers(javaCont[i], javaPath, javaPath, javaCont);
- int size2 = mr.length;
- for (int j = 0; j < size2; j++) {
- if (!members.contains(mr[j]))
- members.add(mr[j]);
- }
- }
-
- if (vc != null) {
- List utilMembers = getUtilMembers(vc);
- if (!utilMembers.isEmpty())
- members.addAll(utilMembers);
- List consumableMembers = getConsumableReferencedMembers(vc);
- if (!consumableMembers.isEmpty())
- members.addAll(consumableMembers);
- }
-
- IModuleResource[] mr = new IModuleResource[members.size()];
- members.toArray(mr);
- return mr;
- }
-
- protected IModuleResource[] handleJavaPath(IPath path, IPath javaPath, IPath curPath, IContainer[] javaCont, IModuleResource[] mr, IContainer cc) throws CoreException {
- if (curPath.equals(javaPath)) {
- int size = javaCont.length;
- for (int i = 0; i < size; i++) {
- IModuleResource[] mr2 = getMembers(javaCont[i], path.append(cc.getName()), null, null);
- IModuleResource[] mr3 = new IModuleResource[mr.length + mr2.length];
- System.arraycopy(mr, 0, mr3, 0, mr.length);
- System.arraycopy(mr2, 0, mr3, mr.length, mr2.length);
- mr = mr3;
- }
- } else {
- boolean containsFolder = false;
- String name = javaPath.segment(curPath.segmentCount());
- int size = mr.length;
- for (int i = 0; i < size && !containsFolder; i++) {
- if (mr[i] instanceof IModuleFolder) {
- IModuleFolder mf2 = (IModuleFolder) mr[i];
- if (name.equals(mf2.getName())) {
- containsFolder = true;
- }
- }
- }
-
- if (!containsFolder && javaCont.length > 0) {
- ModuleFolder mf2 = new ModuleFolder(javaCont[0], name, curPath);
- IModuleResource[] mrf = new IModuleResource[0];
- size = javaCont.length;
- for (int i = 0; i < size; i++) {
- IModuleResource[] mrf2 = getMembers(javaCont[i], javaPath, null, null);
- IModuleResource[] mrf3 = new IModuleResource[mrf.length + mrf2.length];
- System.arraycopy(mrf, 0, mrf3, 0, mrf.length);
- System.arraycopy(mrf2, 0, mrf3, mrf.length, mrf2.length);
- mrf = mrf3;
- }
-
- mf2.setMembers(mrf);
-
- IModuleResource[] mr3 = new IModuleResource[mr.length + 1];
- System.arraycopy(mr, 0, mr3, 0, mr.length);
- mr3[mr.length] = mf2;
- mr = mr3;
- }
- }
- return mr;
- }
-
- /**
- * Returns the classpath as a list of absolute IPaths.
- *
- * @return an array of paths
- */
- public IPath[] getClasspath() {
- List paths = new ArrayList();
- IJavaProject proj = JemProjectUtilities.getJavaProject(getProject());
- URL[] urls = JemProjectUtilities.getClasspathAsURLArray(proj);
- for (int i = 0; i < urls.length; i++) {
- URL url = urls[i];
- paths.add(Path.fromOSString(url.getPath()));
- }
- return (IPath[]) paths.toArray(new IPath[paths.size()]);
- }
-
- public String getJNDIName(String ejbName) {
- if (!J2EEProjectUtilities.isEJBProject(component.getProject()))
- return null;
- EjbModuleExtensionHelper modHelper = null;
- EJBJar jar = null;
- ArtifactEdit ejbEdit = null;
- try {
- ejbEdit = ComponentUtilities.getArtifactEditForRead(component);
- if (ejbEdit != null) {
- jar = (EJBJar) ejbEdit.getContentModelRoot();
- modHelper = IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (ejbEdit != null)
- ejbEdit.dispose();
- }
- return modHelper == null ? null : modHelper.getJNDIName(jar, jar.getEnterpriseBeanNamed(ejbName));
- }
-
- /**
- * This method will handle a number of J2EE related scenarios. If this is an ear and a child module is passed in,
- * the URI for that child module will be returned. If no child module was passed, the URI of the EAR is returned.
- * If this is a child component and the module passed in is the EAR, we grab the module uri for this compared to that
- * EAR. If no ear module is passed in we look for one and use it and return URI relative to found EAR. If no EAR's
- * are found the URI is returned in a default manner.
- *
- * @return URI string
- */
- public String getURI(IModule module) {
- // If the component is an ear and the module passed in is a child module
- if (component!=null && module!=null && J2EEProjectUtilities.isEARProject(component.getProject()))
- return getContainedURI(module);
-
- IVirtualComponent ear = null;
- String aURI = null;
- // If the component is a child module and the module passed in is the ear
- if (module != null && J2EEProjectUtilities.isEARProject(module.getProject()))
- ear = ComponentCore.createComponent(module.getProject());
- // else if the component is a child module and the module passed in is null or bogus, search for first ear
- else {
- if (component != null) {
- IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects(component.getProject());
- if (earProjects.length>0)
- ear = ComponentCore.createComponent(earProjects[0]);
- }
- }
- // We have a valid ear and the component is a valid child
- if (ear != null && component != null) {
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(ear);
- if (earEdit != null)
- aURI = earEdit.getModuleURI(component);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (earEdit != null)
- earEdit.dispose();
- }
- }
- // We have an ear component and no child module
- else if (component!=null && J2EEProjectUtilities.isEARProject(component.getProject())) {
- aURI = component.getDeployedName()+IJ2EEModuleConstants.EAR_EXT;
- }
- // We have child components but could not find valid ears
- else if (component!=null && J2EEProjectUtilities.isDynamicWebProject(component.getProject())) {
- aURI = component.getDeployedName()+IJ2EEModuleConstants.WAR_EXT;
- }
- else if (component!=null && (J2EEProjectUtilities.isEJBProject(component.getProject()) || J2EEProjectUtilities.isApplicationClientProject(component.getProject()))) {
- aURI = component.getDeployedName()+IJ2EEModuleConstants.JAR_EXT;
- }
- else if (component!=null && J2EEProjectUtilities.isJCAProject(component.getProject())) {
- aURI = component.getDeployedName()+IJ2EEModuleConstants.RAR_EXT;
- }
-
- if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
- aURI = aURI.substring(1);
- return aURI;
- }
-
- private String getContainedURI(IModule module) {
- IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
- String aURI = null;
- if (comp!=null && component!=null && J2EEProjectUtilities.isEARProject(component.getProject())) {
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(component);
- if (earEdit != null)
- aURI = earEdit.getModuleURI(comp);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (earEdit != null)
- earEdit.dispose();
- }
- }
- if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
- aURI = aURI.substring(1);
- return aURI;
- }
-
- /**
- * This method returns the context root property from the deployable project's .component file
- */
- public String getContextRoot() {
- Properties props = component.getMetaProperties();
- if(props.containsKey(J2EEConstants.CONTEXTROOT))
- return props.getProperty(J2EEConstants.CONTEXTROOT);
- return component.getName();
- }
-
- /**
- * This method is applicable for a web deployable. The module passed in should either be null or
- * the EAR module the web deployable is contained in. It will return the context root from the EAR
- * if it has one or return the .component value in the web project if it is standalone.
- *
- * @param module
- * @return contextRoot String
- */
- public String getContextRoot(IModule earModule) {
- IProject deployProject = component.getProject();
- String contextRoot = null;
- if (earModule == null)
- return getContextRoot();
- else if (J2EEProjectUtilities.isEARProject(earModule.getProject()) && J2EEProjectUtilities.isDynamicWebProject(deployProject)) {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earModule.getProject());
- contextRoot = edit.getWebContextRoot(deployProject);
- } finally {
- if (edit!=null)
- edit.dispose();
- }
- }
- return contextRoot;
- }
-
- protected boolean isFileInSourceContainer(IFile file) {
- boolean result = false;
- if (file == null)
- return false;
- IPackageFragmentRoot[] srcContainers = J2EEProjectUtilities.getSourceContainers(getProject());
- for (int i=0; i<srcContainers.length; i++) {
- IPath srcPath = srcContainers[i].getPath();
- result = srcPath.isPrefixOf(file.getFullPath());
- if (result)
- break;
- }
- return result;
- }
-
- protected List getConsumableReferencedMembers(IVirtualComponent vc) throws CoreException {
- List consumableMembers = new ArrayList();
- IVirtualReference[] refComponents = vc.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualReference reference = refComponents[i];
- if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_CONSUMES) {
- IVirtualComponent consumedComponent = reference.getReferencedComponent();
- if (consumedComponent!=null && isProjectOfType(consumedComponent.getProject(),IModuleConstants.JST_UTILITY_MODULE)) {
- if (consumedComponent != null) {
- IVirtualFolder vFolder = consumedComponent.getRootFolder();
- IModuleResource[] mr = getMembers(vFolder, reference.getRuntimePath().makeRelative());
- int size = mr.length;
- for (int j = 0; j < size; j++) {
- if (!members.contains(mr[j]))
- members.add(mr[j]);
- }
- List utilMembers = getUtilMembers(consumedComponent);
- if (!utilMembers.isEmpty())
- members.addAll(utilMembers);
- List childConsumableMembers = getConsumableReferencedMembers(consumedComponent);
- if (!childConsumableMembers.isEmpty())
- members.addAll(childConsumableMembers);
- }
-
- IContainer[] javaCont = getJavaOutputFolders(consumedComponent.getProject());
- int size = javaCont.length;
- for (int j = 0; j < size; j++) {
- IModuleResource[] mr = getMembers(javaCont[j], reference.getRuntimePath(), reference.getRuntimePath(), javaCont);
- int size2 = mr.length;
- for (int k = 0; k < size2; k++) {
- if (!members.contains(mr[k]))
- members.add(mr[k]);
- }
- }
- }
- }
- }
- return consumableMembers;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/CatalogJ2EEXmlDtDEntityResolver.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/CatalogJ2EEXmlDtDEntityResolver.java
deleted file mode 100644
index 8f41b48..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/CatalogJ2EEXmlDtDEntityResolver.java
+++ /dev/null
@@ -1,42 +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.jst.j2ee.internal.plugin;
-
-import java.io.IOException;
-
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.xml.sax.InputSource;
-
-public class CatalogJ2EEXmlDtDEntityResolver extends J2EEXmlDtDEntityResolver {
-
- private URIResolver uriResolver;
-
- public CatalogJ2EEXmlDtDEntityResolver() {
- }
-
- public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) throws IOException, org.xml.sax.SAXException {
- if (uriResolver == null) {
- uriResolver = URIResolverPlugin.createResolver();
- }
- String uri = uriResolver.resolve(null, publicId, systemId);
- if (null != uri) {
- InputSource result = new InputSource(uri);
- result.setPublicId(publicId);
- // force the encoding to be UTF8
- result.setEncoding("UTF-8"); //$NON-NLS-1$
- return result;
- }
- return super.resolveEntity(publicId, systemId);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEModuleConstants.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEModuleConstants.java
deleted file mode 100644
index 5174b5d..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEModuleConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.internal.plugin;
-
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-public interface IJ2EEModuleConstants extends IModuleConstants {
-
- public static final String J2EE_PLUGIN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$
-
- public static final String EAR_EXT = ".ear"; //$NON-NLS-1$
- public static final String JAR_EXT = ".jar"; //$NON-NLS-1$
- public static final String WAR_EXT = ".war"; //$NON-NLS-1$
- public static final String RAR_EXT = ".rar"; //$NON-NLS-1$
-
- public static final String JST_EAR_TEMPLATE = "template.jst.ear"; //$NON-NLS-1$
- public static final String JST_UTILITY_TEMPLATE = "template.jst.utility"; //$NON-NLS-1$
- public static final String JST_APPCLIENT_TEMPLATE = "template.jst.appclient"; //$NON-NLS-1$
- public static final String JST_EJB_TEMPLATE = "template.jst.ejb"; //$NON-NLS-1$
- public static final String JST_JCA_TEMPLATE = "template.jst.connector"; //$NON-NLS-1$
- public static final String JST_WEB_TEMPLATE = "template.jst.web"; //$NON-NLS-1$
- public static final String WST_WEB_TEMPLATE = "template.wst.web"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEPreferences.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEPreferences.java
deleted file mode 100644
index a0c2f8a..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEPreferences.java
+++ /dev/null
@@ -1,23 +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.jst.j2ee.internal.plugin;
-
-
-public interface IJ2EEPreferences {
-
- String PREF_J2EEWEBCONTENT = "org.eclipse.jst.j2ee.internal.preference.j2eeWebContentName"; //$NON-NLS-1$
- String PREF_STATICWEBCONTENT = "org.eclipse.jst.j2ee.internal.preference.staticWebContentName"; //$NON-NLS-1$
- String PREF_JAVASOURCE = "org.eclipse.jst.j2ee.internal.preference.javaSourceName"; //$NON-NLS-1$
- String DEFAULT_J2EEWEBCONTENT = "WebContent"; //$NON-NLS-1$
- String DEFAULT_STATICWEBCONTENT = "WebContent"; //$NON-NLS-1$
- String DEFAULT_JAVASOURCE = "JavaSource"; //$NON-NLS-1$
- String SERVER_TARGET_SUPPORT = "org.eclipse.jst.j2ee.internal.preference.servertargetsupport"; //$NON-NLS-1$
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java
deleted file mode 100644
index 69cb751..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java
+++ /dev/null
@@ -1,47 +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
- *******************************************************************************/
-/*
- * Created on Dec 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.frameworks.internal.enablement.IGroupInitializer;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class J2EEGroupInitializer implements IGroupInitializer {
-
- /**
- *
- */
- public J2EEGroupInitializer() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.group.IGroupInitializer#isGroupEnabled(org.eclipse.core.resources.IProject)
- */
- public boolean isGroupEnabled(IProject project) {
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
deleted file mode 100644
index cc9441e..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
+++ /dev/null
@@ -1,581 +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.jst.j2ee.internal.plugin;
-
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.UIContextDetermination;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationFactoryImpl;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationResourceFactory;
-import org.eclipse.jst.j2ee.applicationclient.internal.modulecore.util.AppClientEditAdapterFactory;
-import org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit;
-import org.eclipse.jst.j2ee.internal.common.VirtualArchiveComponentAdapterFactory;
-import org.eclipse.jst.j2ee.internal.modulecore.util.EarEditAdapterFactory;
-import org.eclipse.jst.j2ee.internal.validation.ResourceUtil;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtensionRegistry;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.refactor.listeners.J2EEElementChangedListener;
-import org.eclipse.jst.j2ee.refactor.listeners.ProjectRefactoringListener;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentXMIResourceFactory;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedXMIFactoryImpl;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * This is a top-level class of the j2ee plugin.
- *
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-
-public class J2EEPlugin extends WTPPlugin implements ResourceLocator {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$
- public static final String UI_PLUGIN_ID = "org.eclipse.jst.j2ee.ui"; //$NON-NLS-1$
- protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
- // LibDir Change Listener
- public static final String LIBDIRCHANGE_BUILDER_ID = "org.eclipse.jst.j2ee.web.LibDirBuilder"; //$NON-NLS-1$
- // LibCopy builder ID
- public static final String LIBCOPY_BUILDER_ID = PLUGIN_ID + ".LibCopyBuilder"; //$NON-NLS-1$
- // Validation part of the plugin
- public static final String VALIDATION_BUILDER_ID = ValidationPlugin.VALIDATION_BUILDER_ID; // plugin
-// private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
-// private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$
- // id
- // of
- // the
- // validation
- // builder//$NON-NLS-1$
- //Global ResourceSet (somewhat global)
- private static boolean defaultIsWorkspaceRelativeSchema = false;
-
- private List fextendedEditModels;
- private static IPath location;
-
- public static IStatus OK_STATUS = new Status(IStatus.OK, PLUGIN_ID, 0, "OK", null); //$NON-NLS-1$
-
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/cview16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/clcl16", //$NON-NLS-1$
- "icons/full/ovr16", //$NON-NLS-1$
- "icons/full/extra", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- protected static Boolean EJB_AVAILABLE = null;
- private static Boolean HAS_DEV_ROLE;
-
- private J2EEPreferences preferences = null;
- public static J2EEPlugin INSTANCE;
-
- /**
- * Create the J2EE plugin and cache its default instance
- */
- public J2EEPlugin() {
- super();
- if (INSTANCE == null)
- INSTANCE = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
-
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (7/16/2001 7:38:56 PM)
- *
- * @return boolean
- */
- public static boolean defaultIsWorkspaceRelativeSchema() {
- return defaultIsWorkspaceRelativeSchema;
- }
-
- /**
- * Get the one application factory.
- */
- public ApplicationFactory getApplicationFactory() {
- return (ApplicationFactory) getApplicationPackage().getEFactoryInstance();
- }
-
- /**
- * Get the one ejb package.
- */
- public ApplicationPackage getApplicationPackage() {
- return ApplicationFactoryImpl.getPackage();
- }
-
- /**
- * Get the plugin singleton.
- */
- static public J2EEPlugin getDefault() {
- return INSTANCE;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public URL getBaseURL() {
- return getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
-
- public Object[] getJ2EEWebProjectMigrationExtensions() {
-
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint pct = registry.getExtensionPoint("J2EEWebProjectMigrationExtension"); //$NON-NLS-1$
- List ret = new Vector();
- if (pct != null) {
- IExtension[] extension = pct.getExtensions();
- for (int l = 0; l < extension.length; ++l) {
- IExtension config = extension[l];
-
- IConfigurationElement[] cElems = config.getConfigurationElements();
- for (int i = 0; i < cElems.length; i++) {
- IConfigurationElement d = cElems[i];
- if (d.getName().equals("migration")) { //$NON-NLS-1$
- try {
- Object me = d.createExecutableExtension("run"); //$NON-NLS-1$
-
- ret.add(me);
- } catch (Exception ex) {
- // ignore this extension, keep going
- }
- }
- }
- }
- }
- return ret.toArray();
- }
-
- public EditModel getExtendedEditModel(String editModelKey) {
-
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint pct = registry.getExtensionPoint("EditModelExtension"); //$NON-NLS-1$
-
- IExtension[] extension = pct.getExtensions();
- for (int l = 0; l < extension.length; ++l) {
- IExtension config = extension[l];
-
- IConfigurationElement[] cElems = config.getConfigurationElements();
- for (int i = 0; i < cElems.length; i++) {
- IConfigurationElement d = cElems[i];
- if (d.getName().equals("editmodel") && editModelKey.equals(d.getAttribute("key"))) //$NON-NLS-1$ //$NON-NLS-2$
- { // editmodel class
- try {
- return (EditModel) d.createExecutableExtension("run"); //$NON-NLS-1$
-
- } catch (Exception ex) {
- return null;
- }
- }
- }
- }
-
- return null;
- }
-
- public List getExtendedEditModels() {
-
- if (fextendedEditModels != null)
- return fextendedEditModels;
- List editModels = new ArrayList();
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint pct = registry.getExtensionPoint("EditModelExtension"); //$NON-NLS-1$
-
- IExtension[] extension = pct.getExtensions();
- for (int l = 0; l < extension.length; ++l) {
- IExtension config = extension[l];
-
- IConfigurationElement[] cElems = config.getConfigurationElements();
- for (int i = 0; i < cElems.length; i++) {
- IConfigurationElement d = cElems[i];
- if (d.getName().equals("editmodel")) //$NON-NLS-1$
- {
- // editmodel class
- try {
- editModels.add(d.createExecutableExtension("run")); //$NON-NLS-1$
-
- } catch (Exception ex) {
- return null;
- }
- }
- }
- }
- fextendedEditModels = editModels;
- return fextendedEditModels;
- }
-
- /**
- * 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 (Platform.find(bundle,path) == null)
- continue;
- try {
- return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Load_Image_Error_", new Object[]{key})); //$NON-NLS-1$
- exception.printStackTrace();
- continue;
- }
- }
- return null;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public Object getImage(String key) {
- return getImageURL(key,this.getBundle());
- }
-
- public static IPath getInstallLocation() {
- if (location == null) {
- URL url = getInstallURL();
- try {
- String installLocation = ((PlatformURLConnection) url.openConnection()).getURLAsLocal().getFile();
- location = new Path(installLocation);
- } catch (IOException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{url}) + e); //$NON-NLS-1$
- }
- }
- return location;
- }
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- protected static IJavaModel getJavaModel() {
- return JemProjectUtilities.getJavaModel();
- }
-
- protected static IJavaModel getJavaModel(IProject aProject) {
- if (aProject != null)
- return JemProjectUtilities.getJavaModel();
- return null;
- }
-
- public static IJavaProject getJavaProject(IProject project) {
- IJavaModel model = getJavaModel(project);
- if (model != null)
- return model.getJavaProject(project.getName());
- return null;
- }
-
- /**
- * Retrieves a hashtable of a logger's preferences initially from the
- * com.ibm.etools.logging.util.loggingDefaults extension point if specified in the
- * com.ibm.etools.logging.util plugin.xml file. If specified, the
- * com.ibm.etools.logging.util.loggingOptions extension point preferences in the parameter
- * plugin's plugin.xml file are returned.
- *
- * The logger's preferences are stored in the return hashtable using the static instance
- * variables in LoggerStateHashKeys as keys.
- *
- * @param plugin
- * the Plugin polled for their logger's preferences in the plugin.xml file
- * @return hashtable of a logger's preferences
- */
- /*
- * public java.util.Hashtable getMsgLoggerConfig(org.eclipse.core.runtime.Plugin plugin) {
- * return (new PluginHelperImpl().getMsgLoggerConfig(plugin)); }
- */
- /**
- * Get the singleton instance.
- */
- public static J2EEPlugin getPlugin() {
- return INSTANCE;
- }
-
- /**
- * Return the plugin directory location- the directory that all the plugins are located in (i.e.
- * d:\installdir\plugin)
- */
- public static IPath getPluginLocation(String pluginId) {
- //IExtensionRegistry registry = Platform.getExtensionRegistry();
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null) {
- try {
- IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator(); //$NON-NLS-1$
- String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
- return new Path(installStr);
- } catch (IOException e) {
- };
- }
- return null;
- }
-
- protected void initializeDefaultPluginPreferences() {
- getJ2EEPreferences().initializeDefaultPreferences();
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus newErrorStatus(int aCode, String aMessage, Throwable exception) {
- return newStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus newErrorStatus(String aMessage, Throwable exception) {
- return newErrorStatus(0, aMessage, exception);
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation.
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus newOperationFailedStatus(String aMessage, Throwable exception) {
- return newStatus(IStatus.ERROR, IResourceStatus.OPERATION_FAILED, aMessage, exception);
- }
-
- /**
- * Create a new IStatus with a severity using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus newStatus(int severity, int aCode, String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode, aMessage, exception);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key) {
- try {
- return Platform.getResourceString(getBundle(), key);
- } catch (MissingResourceException ex) {
- //TODO Don't throw error - just show unresolved key
- //Logger.getLogger().logError(ex);
- return '!' + key + '!';
- }
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key, Object[] substitutions) {
- return MessageFormat.format(getString(key), substitutions);
- }
-
- /**
- * Insert the method's description here. Creation date: (7/16/2001 7:38:56 PM)
- *
- * @param newDefaultIsWorkspaceRelativeSchema
- * boolean
- */
- public static void setDefaultIsWorkspaceRelativeSchema(boolean newDefaultIsWorkspaceRelativeSchema) {
- defaultIsWorkspaceRelativeSchema = newDefaultIsWorkspaceRelativeSchema;
- }
-
- /**
- * This method should be used to determine if the EJB UI support is currently packaged in the
- * image.
- */
- public static boolean isEJBSupportAvailable() {
- if (EJB_AVAILABLE == null) {
- //TODO We need a better mechanism for the detection of the EJB support.
- //IPluginDescriptor desc =
- // Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.internal.internal.ejb.ui");
- // //$NON-NLS-1$
- // EJB_AVAILABLE = new Boolean(desc != null);
- EJB_AVAILABLE = Boolean.TRUE;
- }
- return EJB_AVAILABLE.booleanValue();
- }
-
- /**
- * This method should be used to determine if the workbench is running in UI or Headless
- *
- * @deprecated use {@link org.eclipse.wst.common.frameworks.internal.UIContextDetermination}
- */
- public static boolean isHeadless() {
- return UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
- }
-
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
-
- J2EEXmlDtDEntityResolver.INSTANCE = new CatalogJ2EEXmlDtDEntityResolver();
- DOMUtilities.setDefaultEntityResolver(J2EEXmlDtDEntityResolver.INSTANCE);
- //Have to do the next line immediately to fix timing problems with factory registration
- ArchiveInit.init(false);
-
- //ModuleMaps are the maps from modules in an ear project to the j2ee projects for the
- // modules
- org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapInit.init(false);
- ensureFactoryRegistration();
- ValidatorManager.setResourceUtilClass(ResourceUtil.class);
- IAdapterManager manager = Platform.getAdapterManager();
- manager.registerAdapters(new EarEditAdapterFactory(), ArtifactEditModel.class);
- manager.registerAdapters(new AppClientEditAdapterFactory(), ArtifactEditModel.class);
- ApplicationResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- ApplicationClientResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- WSDLServiceExtensionRegistry.getInstance();
-
- manager.registerAdapters(new VirtualArchiveComponentAdapterFactory(), VirtualArchiveComponent.class );
-
- final ProjectRefactoringListener listener = new ProjectRefactoringListener();//ProjectDependencyCache.getCache());
- // register the project rename/delete refactoring listener
- ResourcesPlugin.getWorkspace().addResourceChangeListener(listener,
- IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE);
-
- // register the IElementChangedLister that updates the .component file in
- // response to .classpath changes
- JavaCore.addElementChangedListener(new J2EEElementChangedListener(), ElementChangedEvent.POST_CHANGE);
- }
-
- /*
- * need to make sure the correct factories get loaded when we are in the UI
- */
- private void ensureFactoryRegistration() {
- //Inside the workbench we do not want the global override defined here.
- ensureDefaultReferencedXMIResourceFactoryRegistration();
- }
-
- /**
- *
- */
- private void ensureDefaultReferencedXMIResourceFactoryRegistration() {
- J2EEResourceFactoryRegistry reg1 = J2EEResourceFactoryRegistry.INSTANCE;
- WTPResourceFactoryRegistry reg2 = WTPResourceFactoryRegistry.INSTANCE;
- ReferencedXMIFactoryImpl factory = new ReferencedComponentXMIResourceFactory();
- reg1.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, factory);
- reg2.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, factory);
- // add xmi because other plugins are registering it globally
- reg1.getExtensionToFactoryMap().put("xmi", factory); //$NON-NLS-1$
- reg2.getExtensionToFactoryMap().put("xmi", factory); //$NON-NLS-1$
- }
-
- /**
- * This is currently just a convenience api for the AAW to turn off unwanted actions. It will
- * currently be initialized based on the existence of the AAW plugin.
- */
- public static boolean hasDevelopmentRole() {
- if (HAS_DEV_ROLE == null) {
- Bundle desc = Platform.getBundle("org.eclipse.jst.j2ee.assembly"); //$NON-NLS-1$
- HAS_DEV_ROLE = desc != null ? Boolean.FALSE : Boolean.TRUE;
- }
- return HAS_DEV_ROLE.booleanValue();
- }
-
- public static IWorkspaceRunnable getWorkspaceRunnable(final IHeadlessRunnableWithProgress op) {
- return new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- try {
- op.run(monitor);
- } catch (InvocationTargetException e) {
- throw new CoreException(newErrorStatus(0, e.getMessage(), e));
- } catch (InterruptedException e) {
- throw new CoreException(newErrorStatus(0, e.getMessage(), e));
- }
- }
- };
- }
-
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * @return Returns the preferences.
- */
- public J2EEPreferences getJ2EEPreferences() {
- if (this.preferences == null)
- this.preferences = new J2EEPreferences(this);
- return this.preferences;
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPluginResourceHandler.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPluginResourceHandler.java
deleted file mode 100644
index f832639..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPluginResourceHandler.java
+++ /dev/null
@@ -1,76 +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.jst.j2ee.internal.plugin;
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class J2EEPluginResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "j2eewtpplugin";//$NON-NLS-1$
-
- private J2EEPluginResourceHandler() {
- // Do not instantiate
- }
-
- public static String __Considering_delta_INFO_;
- public static String WARNING_METAFOLDER_MISSING_UI_;
- public static String Not_a_J2EE_project_UI_;
- public static String CoreException_could_not_initialize_Web_Service_class_path_variables_ERROR_;
- public static String Error_opening_archive_for_export_2;
- public static String J2EEDeployOperation_2_UI_;
- public static String No_library_folder_UI_;
- public static String J2EEDeployOperation_UI_Null_Status;
- public static String RAR_File;
- public static String NESTED_JAVA_OUTPUT_ERROR;
- public static String J2EEModulePostImportHelper_3;
- public static String J2EEModulePostImportHelper_2;
- public static String J2EEModulePostImportHelper_1;
- public static String J2EEModulePostImportHelper_0;
- public static String Some_source_types_have______in_their_name_ERROR_;
- public static String J2EEDeployOperation_UI_1;
- public static String J2EEDeployOperation_UI_0;
- public static String _UI_ParamValue_type;
- public static String J2EEDeployOperation_1_UI_;
- public static String An_error_occurred_while_sa_ERROR_;
- public static String WARNING_FILE_MISSING_UI_;
- public static String Cannot_load_EJBJar_because_model_is_null_UI_;
- public static String __Bad_builder_order_for_project_INFO_;
- public static String No_source_types_UI_;
- public static String EJBProjectResources_getEJBJar_EJBEditModel__UI_;
- public static String __No_imported_classes_folder__quitting_INFO_;
- public static String The_following_resources_ne_UI_;
- public static String J2EEDeployOperation_4_UI_;
- public static String __Full_first_build_INFO_;
- public static String Error_occurred_saving_the_manifest_7;
- public static String Cannot_load_EJBFile_because_ejbNature_asEJBJarFile___returns_null_UI_;
- public static String __Delta_build_INFO_;
- public static String __Start_build_project_INFO_;
- public static String Cannot_load_EJBFile_because_EJBNatureRuntime_is_null_UI_;
- public static String Minimizing_project_UI_;
- public static String Error_getting_project_nature_runtime_6;
- public static String Creating_Connector_Project_5;
- public static String Error_getting_project_nature_runtime_3;
- public static String J2EEDeployOperation_3_UI_;
- public static String Unable_to_save_read_only_f_ERROR_;
- public static String Could_not_find_root_object_ERROR_;
- public static String Cannot_run_J2EEUIWorkingCo_ERROR_;
- public static String Cannot_load_EJBFile_because_EJBEditModel_is_null_UI_;
- public static String Error_occurred_loading_ra_xml__4;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, J2EEPluginResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java
deleted file mode 100644
index d381d03..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java
+++ /dev/null
@@ -1,189 +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
- *******************************************************************************/
-/*
- * Created on Jan 26, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * @author mdelder
- */
-public class J2EEPreferences {
-
- public interface Keys {
- final static String J2EE_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.j2eeWebContentName"; //$NON-NLS-1$
- final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
- final static String JAVA_SOURCE = "org.eclipse.jst.j2ee.preference.javaSourceName"; //$NON-NLS-1$
- final static String SERVER_TARGET_SUPPORT = "org.eclipse.jst.j2ee.preference.servertargetsupport"; //$NON-NLS-1$
- final static String CREATE_EJB_CLIENT_JAR = "org.eclipse.jst.j2ee.preference.createClientJar"; //$NON-NLS-1$
- final static String J2EE_VERSION = "org.eclipse.jst.j2ee.ui.preference.j2eeVersion"; //$NON-NLS-1$
- final static String EJB_CLIENT_JAR_CP_COMPATIBILITY = "org.eclipse.jst.j2ee.preference.clientjar.cp.compatibility"; //$NON-NLS-1$
- final static String INCREMENTAL_DEPLOYMENT_SUPPORT = "org.eclipse.jst.j2ee.ui.preference.incrementalDeployment"; //$NON-NLS-1$
-
-
- }
-
- public interface Values {
- final static String J2EE_VERSION_1_2 = "J2EE_1_2"; //$NON-NLS-1$
- final static String J2EE_VERSION_1_3 = "J2EE_1_3"; //$NON-NLS-1$
- final static String J2EE_VERSION_1_4 = "J2EE_1_4"; //$NON-NLS-1$
-
- final static String J2EE_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- final static String JAVA_SOURCE = "JavaSource"; //$NON-NLS-1$
- }
-
- public interface Defaults {
-
- final static String J2EE_WEB_CONTENT = Values.J2EE_WEB_CONTENT;
- final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
- final static String JAVA_SOURCE = Values.JAVA_SOURCE;
- final static String J2EE_VERSION = Values.J2EE_VERSION_1_4;
- final static int J2EE_VERSION_ID = J2EEVersionConstants.J2EE_1_4_ID;
- final static boolean CREATE_EJB_CLIENT_JAR = false;
- final static boolean EJB_CLIENT_JAR_CP_COMPATIBILITY = true;
- final static boolean INCREMENTAL_DEPLOYMENT_SUPPORT = true;
- }
-
- private Plugin owner = null;
- private Preferences preferences = null;
- private boolean persistOnChange = false;
-
- public J2EEPreferences(Plugin owner) {
- this.owner = owner;
- }
-
- protected void initializeDefaultPreferences() {
- getPreferences().setDefault(Keys.J2EE_WEB_CONTENT, Defaults.J2EE_WEB_CONTENT);
- getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
- getPreferences().setDefault(Keys.JAVA_SOURCE, Defaults.JAVA_SOURCE);
-
- getPreferences().setDefault(Keys.J2EE_VERSION, Defaults.J2EE_VERSION);
- getPreferences().setDefault(Keys.CREATE_EJB_CLIENT_JAR, Defaults.CREATE_EJB_CLIENT_JAR);
- getPreferences().setDefault(Keys.EJB_CLIENT_JAR_CP_COMPATIBILITY, Defaults.EJB_CLIENT_JAR_CP_COMPATIBILITY);
- getPreferences().setDefault(Keys.INCREMENTAL_DEPLOYMENT_SUPPORT, Defaults.INCREMENTAL_DEPLOYMENT_SUPPORT);
-
- }
-
- public String getJ2EEWebContentFolderName() {
- return getPreferences().getString(Keys.J2EE_WEB_CONTENT);
- }
-
- public String getStaticWebContentFolderName() {
- return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
- }
-
- public String getJavaSourceFolderName() {
- return getPreferences().getString(Keys.JAVA_SOURCE);
- }
-
- public String getHighestJ2EEVersionSetting() {
- return getPreferences().getString(Keys.J2EE_VERSION);
- }
-
- public boolean isServerTargetingEnabled() {
- return getPreferences().getBoolean(Keys.SERVER_TARGET_SUPPORT);
- }
-
- ///
- public void setJ2EEWebContentFolderName(String value) {
- getPreferences().setValue(Keys.J2EE_WEB_CONTENT, value);
- firePreferenceChanged();
- }
-
- public void setStaticWebContentFolderName(String value) {
- getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
- firePreferenceChanged();
- }
-
- public void setJavaSourceFolderName(String value) {
- getPreferences().setValue(Keys.JAVA_SOURCE, value);
- firePreferenceChanged();
- }
-
- public void setHighestJ2EEVersionSetting(String value) {
- getPreferences().setValue(Keys.J2EE_VERSION, value);
- firePreferenceChanged();
- }
-
- public void setServerTargetingEnabled(boolean value) {
- getPreferences().setValue(Keys.SERVER_TARGET_SUPPORT, value);
- firePreferenceChanged();
- }
-
- public void setIncrementalDeploymentEnabled(boolean value) {
- getPreferences().setValue(Keys.INCREMENTAL_DEPLOYMENT_SUPPORT, value);
- firePreferenceChanged();
- }
-
- public boolean isIncrementalDeploymentEnabled() {
- return getPreferences().getBoolean(Keys.INCREMENTAL_DEPLOYMENT_SUPPORT);
- }
-
- /**
- * @return one of J2EEVersionConstants.J2EE_VERSION_X_X (@see J2EEVersionConstants)
- */
- public int getHighestJ2EEVersionID() {
- String versionPreference = getHighestJ2EEVersionSetting();
- if (Values.J2EE_VERSION_1_2.equals(versionPreference))
- return J2EEVersionConstants.J2EE_1_2_ID;
- else if (Values.J2EE_VERSION_1_3.equals(versionPreference))
- return J2EEVersionConstants.J2EE_1_3_ID;
- else
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
-
- 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;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java
deleted file mode 100644
index 9332a37..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java
+++ /dev/null
@@ -1,506 +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.jst.j2ee.internal.plugin;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-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.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-
-/**
- * An example incremental project builder that copies additional class files from a library package
- * fragment root folder into a Java project's output directory.
- *
- * General parameters:
- * <ul>
- * <li>The project should be a Java project.</li>
- * <li>The class files are in the "imported_classes" folder of the project.</li>
- * <li>This builder should run <b>after </b> the Java builder.</li>
- * <li>Full build should copy class files from a secondary library folder into the output folder
- * maintaining package hierarchy; existing class files must never be overwritten.</li>
- * <li>Only *.class files should be copied (not other resource files).</li>
- * <li>Incremental build and auto-build should will perform the copy when there is an add/change in
- * the "imported_classes" folder.</li>
- * <li>Changing the project's output folder should be handled.</li>
- * </ul>
- * Note: the builder is not currently invoking the Minimize helper, it is relying on the copy to not
- * replace existing class files, and the build path order to ensure that compiled classes override
- * imported ones.
- */
-public class LibCopyBuilder extends IncrementalProjectBuilder {
- /**
- * Internal debug tracing.
- */
- static boolean DEBUG = false;
-
- /**
- * Builder id of this incremental project builder.
- */
- public static final String BUILDER_ID = J2EEPlugin.LIBCOPY_BUILDER_ID;
-
- /**
- * The path where we expect to find the .class files to be copied.
- */
- public static final String IMPORTED_CLASSES_PATH = "imported_classes"; //$NON-NLS-1$
-
- /**
- * The path of the output folder that we last copied class files into, or <code>null</code> if
- * this builder has not built this project before.
- */
- private IPath lastOutputPath = null;
-
- private List sourceContainers;
-
- private boolean needOutputRefresh;
-
- /**
- * Creates a new instance of the library copying builder.
- * <p>
- * All incremental project builders are required to have a public 0-argument constructor.
- * </p>
- */
- public LibCopyBuilder() {
- super();
- }
-
-
- /**
- *
- * The <code>LibCopyBuilder</code> implementation of this
- * <code>IncrementalProjectBuilder</code> method copies additional class files into the output
- * folder.
- * <p>
- * [Issue: the implementation should report progress.]
- * </p>
- * <p>
- * [Issue: the implementation should probably use a workspace runnable.]
- * </p>
- */
- protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
- sourceContainers = null;
- needOutputRefresh = false;
- if (DEBUG) {
- System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Start_build_project_INFO_ + getProject().getName());
- }
-
- boolean builderOrderOK = checkBuilderOrdering();
-
- if (DEBUG && !builderOrderOK) {
- System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Bad_builder_order_for_project_INFO_ + getProject().getName());
- }
-
- IFolder[] classFolders = getClassesFolders();
- if (classFolders.length == 0) {
- // no files to copy
- if (DEBUG)
- System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__No_imported_classes_folder__quitting_INFO_);
- return null;
- }
-
- IJavaProject jproject = JavaCore.create(getProject());
- if (jproject == null) {
- // not a java project (anymore?)
- return null;
- }
-
- IPath outputPath = jproject.getOutputLocation();
- IFolder outputFolder = getProject().getParent().getFolder(outputPath);
- if (outputPath.equals(lastOutputPath)) {
- if (kind == INCREMENTAL_BUILD || kind == AUTO_BUILD) {
- processDelta(getDelta(getProject()), outputFolder, monitor, classFolders);
- refreshOutputIfNecessary(outputFolder);
- return null;
- }
- }
-
- if (DEBUG) {
- System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Full_first_build_INFO_);
- }
- copyAllClassFolders(monitor, classFolders, outputFolder);
- lastOutputPath = outputPath;
- refreshOutputIfNecessary(outputFolder);
- return null;
- }
-
- /**
- *
- */
- private void refreshOutputIfNecessary(IFolder outputFolder) throws CoreException {
- if (needOutputRefresh && outputFolder != null && outputFolder.exists())
- outputFolder.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- private void copyAllClassFolders(IProgressMonitor monitor, IFolder[] classFolders, IFolder outputFolder) throws CoreException {
- for (int i = 0; i < classFolders.length; i++) {
- copyClassFiles(classFolders[i], outputFolder, monitor);
- }
-
- }
-
-
- /**
- * Process an incremental build delta.
- *
- * @return <code>true</code> if the delta requires a copy
- * @param dest
- * the destination folder; may or may not exist
- * @param monitor
- * the progress monitor, or <code>null</code> if none
- * @exception CoreException
- * if something goes wrong
- */
- protected void processDelta(IResourceDelta delta, final IFolder outputFolder, final IProgressMonitor monitor, final IFolder[] classesFolders) {
- if (DEBUG) {
- System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Considering_delta_INFO_ + delta);
- }
- IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
- private List copiedClassFolders = new ArrayList(classesFolders.length);
-
- public boolean visit(IResourceDelta subdelta) throws CoreException {
- IResource resource = subdelta.getResource();
- if (resource.getType() == IResource.FILE) {
- IFolder classesFolder = retrieveClassesFolder(resource, classesFolders);
- if (classesFolder != null && !copiedClassFolders.contains(classesFolder)) {
- int kind = subdelta.getKind();
- switch (kind) {
- case IResourceDelta.ADDED :
- case IResourceDelta.CHANGED :
- if (DEBUG) {
- System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Delta_build_INFO_ + subdelta);
- }
- copyClassFiles(classesFolder, outputFolder, monitor);
- break;
- case IResourceDelta.REMOVED :
- deleteCorrespondingFile((IFile) resource, classesFolder, outputFolder, monitor);
- break;
- case IResourceDelta.ADDED_PHANTOM :
- break;
- case IResourceDelta.REMOVED_PHANTOM :
- break;
- }
-
- }
- } else if (resource.getType() == IResource.FOLDER && resource.equals(outputFolder)) {
- copyAllClassFolders(null, classesFolders, outputFolder);
- return false;
- }
- return true;
- }
- };
- if (delta != null) {
- try {
- delta.accept(visitor);
- } catch (CoreException e) {
- // should not happen
- }
- }
- }
-
- /**
- * @param file
- * @param classesFolder
- * @param outputFolder
- * @param monitor
- */
- protected void deleteCorrespondingFile(IFile file, IFolder classesFolder, IFolder outputFolder, IProgressMonitor monitor) throws CoreException {
- IPath path = file.getFullPath();
- int segCount = classesFolder.getFullPath().segmentCount();
- path = path.removeFirstSegments(segCount);
- IFile javaFile = findCorrespondingJavaFile(path);
- if (javaFile != null && javaFile.exists())
- return; //There is nothing to do because the file in the output location is from the
- // java compilation not the copy.
- IFile outFile = outputFolder.getFile(path);
- if (outFile.exists())
- outFile.delete(true, false, monitor);
- }
-
-
- /**
- * Method retrieveClassesFolder.
- *
- * @param resource
- * @return IFolder
- */
- protected IFolder retrieveClassesFolder(IResource resource, IFolder[] classesFolders) {
- for (int i = 0; i < classesFolders.length; i++) {
- if (classesFolders[i].getName().equals(resource.getProjectRelativePath().segment(0)))
- return classesFolders[i];
- }
- return null;
- }
-
-
- /**
- * Checks whether this builder is configured to run <b>after </b> the Java builder.
- *
- * @return <code>true</code> if the builder order is correct, and <code>false</code>
- * otherwise
- * @exception CoreException
- * if something goes wrong
- */
- private boolean checkBuilderOrdering() throws CoreException {
- // determine relative builder position from project's buildspec
- ICommand[] cs = getProject().getDescription().getBuildSpec();
- int myIndex = -1;
- int javaBuilderIndex = -1;
- for (int i = 0; i < cs.length; i++) {
- if (cs[i].getBuilderName().equals(JavaCore.BUILDER_ID)) {
- javaBuilderIndex = i;
- } else if (cs[i].getBuilderName().equals(BUILDER_ID)) {
- myIndex = i;
- }
- }
- return myIndex > javaBuilderIndex;
- }
-
- /**
- * Copies class files from the given source folder to the given destination folder. The
- * destination folder will be created if required, but only if at least one class file is
- * copied.
- *
- * @param source
- * the source folder; must exist
- * @param dest
- * the destination folder; may or may not exist
- * @param monitor
- * the progress monitor, or <code>null</code> if none
- * @exception CoreException
- * if something goes wrong
- */
- private void copyClassFiles(IFolder source, final IFolder dest, final IProgressMonitor monitor) throws CoreException {
- if (DEBUG) {
- System.out.println(BUILDER_ID + ": Begin copying class files from " + source.getFullPath() + " to " + dest.getFullPath()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- final int sourcePathLength = source.getFullPath().segmentCount();
-
- class Visitor implements IResourceVisitor {
- public boolean visit(IResource res) throws CoreException {
- if (res.getType() == IResource.FILE) {
- IFile file = (IFile) res;
-
- // compute relative path from source folder to this file
- IPath filePath = file.getFullPath();
- IPath dpath = filePath.removeFirstSegments(sourcePathLength);
- IFile targetFile = dest.getFile(dpath);
- copyFile(file, targetFile, dpath, monitor);
- }
- return true;
- }
- }
-
- try {
- source.accept(new Visitor());
- } catch (CoreException e) {
- // should not happen
- }
-
- }
-
- /**
- * Copies the given file to the given destination file. Does nothing if the destination file
- * already exists.
- *
- * @param source
- * the source file; must exist
- * @param dest
- * the destination file; may or may not exist; never overwritten
- * @param monitor
- * the progress monitor, or <code>null</code> if none
- * @exception CoreException
- * if something goes wrong
- */
- private void copyFile(IFile source, IFile dest, IPath fileRelativePath, IProgressMonitor monitor) throws CoreException {
- if (pruneForJavaSource(source, fileRelativePath, monitor))
- return; //no copy necessary.
- File sourceFile = null, destFile = null;
- if (source.exists())
- sourceFile = source.getLocation().toFile();
- if (dest.exists())
- destFile = dest.getLocation().toFile();
-
- if (destFile != null && sourceFile != null) {
- if (DEBUG)
- System.out.println(BUILDER_ID + ": " + dest.getFullPath() + " already exists."); //$NON-NLS-1$ //$NON-NLS-2$
- if (destFile.lastModified() == sourceFile.lastModified())
- return;
- dest.setContents(source.getContents(false), true, false, monitor); //we have to force
- // b/c set the mod
- // stamp makes it
- // think it is out of
- // synch.
- synchronizeModificationStamps(sourceFile, destFile);
- return;
- }
- if (DEBUG) {
- System.out.println(BUILDER_ID + ": Creating " + dest.getFullPath()); //$NON-NLS-1$
- }
-
- IContainer parent = dest.getParent();
- if (parent.getType() == IResource.FOLDER) {
- mkdirs((IFolder) parent, monitor);
- }
- dest.create(source.getContents(false), false, monitor);
- destFile = dest.getLocation().toFile();
- synchronizeModificationStamps(sourceFile, destFile);
- dest.setDerived(true);
- }
-
- /**
- * Return true if a corresponding .java file is found. Remove the .class file from the
- * imported_classes folder (i.e., delete the source file).
- *
- * @param source
- * @param monitor
- * @return
- */
- private boolean pruneForJavaSource(IFile classFile, IPath fileRelativePath, IProgressMonitor monitor) throws CoreException {
- if (classFile.exists()) {
- IFile javaFile = findCorrespondingJavaFile(fileRelativePath);
- if (javaFile != null && javaFile.exists()) {
- ResourcesPlugin.getWorkspace().validateEdit(new IFile[]{javaFile}, null);
- classFile.delete(true, false, monitor);
- return true;
- }
- }
- return false;
- }
-
-
- /**
- * @param classFilePath
- * @return
- */
- private IFile findCorrespondingJavaFile(IPath classFilePath) {
- IPath javaPath = convertToJavaPath(classFilePath);
- List sourceFolders = getSourceContainers();
- IContainer cont;
- IFile javaFile;
- for (int i = 0; i < sourceFolders.size(); i++) {
- cont = (IContainer) sourceFolders.get(i);
- javaFile = cont.getFile(javaPath);
- if (javaFile.exists())
- return javaFile;
- }
- return null;
- }
-
-
- private List getSourceContainers() {
- if (sourceContainers == null)
- sourceContainers = JemProjectUtilities.getSourceContainers(getProject());
- return sourceContainers;
- }
-
-
- /**
- * @param classFile
- * @return
- */
- private IPath convertToJavaPath(IPath classFilePath) {
- IPath javaPath = classFilePath.removeFileExtension();
- //handle inner classes...look for outermost java file
- String fileName = classFilePath.lastSegment();
- int innerIndex = fileName.indexOf('$');
- if (innerIndex > -1) {
- javaPath = javaPath.removeLastSegments(1);
- javaPath = javaPath.append(fileName.substring(0, innerIndex));
- }
- javaPath = javaPath.addFileExtension("java"); //$NON-NLS-1$
- return javaPath;
- }
-
-
- /**
- * @param source
- * @param dest
- */
- private void synchronizeModificationStamps(File sourceFile, File destFile) {
- if (destFile != null && sourceFile != null) {
- destFile.setLastModified(sourceFile.lastModified());
- needOutputRefresh = true;
- }
- }
-
-
- /**
- * Creates the given folder, and its containing folders, if required. Does nothing if the given
- * folder already exists.
- *
- * @param folder
- * the folder to create
- * @param monitor
- * the progress monitor, or <code>null</code> if none
- * @exception CoreException
- * if something goes wrong
- */
- private void mkdirs(IFolder folder, IProgressMonitor monitor) throws CoreException {
- if (folder.exists()) {
- return;
- }
- IContainer parent = folder.getParent();
- if (!parent.exists() && parent.getType() == IResource.FOLDER) {
- mkdirs((IFolder) parent, monitor);
- }
- folder.create(false, true, monitor);
- }
-
- private IFolder[] getClassesFolders() {
- IProject project = getProject();
- IJavaProject javaProj = JemProjectUtilities.getJavaProject(project);
- if (javaProj == null)
- return new IFolder[0];
- List result = null;
- IClasspathEntry[] entries;
- try {
- entries = javaProj.getResolvedClasspath(true);
- } catch (JavaModelException e) {
- return new IFolder[0];
- }
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- IPath path = entry.getPath();
- IResource res = project.getWorkspace().getRoot().findMember(path);
- if (res != null && res.isAccessible() && res.getType() == IResource.FOLDER && res.getProject().equals(project)) {
- if (result == null)
- result = new ArrayList(1);
- result.add(res);
- }
- }
- }
- if (result == null)
- return new IFolder[0];
- return (IFolder[]) result.toArray(new IFolder[result.size()]);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java
deleted file mode 100644
index 6e373f1..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jst.j2ee.internal.validation;
-
-
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Abstract base class for registration of symbolic model names, and also provides the mechanism for
- * registering the load model method which loads a specific type of MOF model, as identified by the
- * symbolic model name.
- */
-public abstract class AWorkbenchMOFHelper extends WorkbenchContext {
- public IResource getResource(Object obj) {
- IResource res = null;
- if ((obj != null) && (obj instanceof EObject)) {
- JavaEMFNature nature = getMOFNature(getProject());
- if (nature != null) {
- EObject ro = (EObject) obj;
- res = WorkbenchResourceHelper.getFile(ro.eResource());
- }
- }
-
- if ((res == null) || (!res.exists())) {
- return super.getResource(obj);
- }
-
- return res;
- }
-
- public JavaEMFNature getMOFNature(IProject project) {
- if (project == null) {
- return null;
- }
-
- IProjectDescription desc = null;
- try {
- desc = project.getDescription();
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext.getMOFNature(IProject)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- return null;
- }
-
- String[] natureIds = desc.getNatureIds();
- for (int i = 0; i < natureIds.length; i++) {
- try {
- IProjectNature nature = project.getNature(natureIds[i]);
- if (nature instanceof JavaEMFNature) {
- return (JavaEMFNature) nature;
- }
- } catch (CoreException exc) {
- // log and attempt next nature
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext.getMOFNature(IProject)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ApplicationClientHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ApplicationClientHelper.java
deleted file mode 100644
index 616a9da..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ApplicationClientHelper.java
+++ /dev/null
@@ -1,85 +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.jst.j2ee.internal.validation;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.model.internal.validation.ApplicationClientMessageConstants;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-
-/**
- * Insert the type's description here. Creation date: (4/9/2001 11:22:53 AM)
- *
- * @author: Administrator
- */
-public class ApplicationClientHelper extends J2EEValidationHelper {
-
- protected ApplicationClientFile appClientFile;
-
- /**
- * ApplicationClientHelper constructor comment.
- */
- public ApplicationClientHelper() {
- super();
- registerModel(ApplicationClientMessageConstants.APPCLIENT_MODEL_NAME, "loadApplicationClientFile"); //$NON-NLS-1$
- }
-
- /**
- * Given a resource, return its non-eclipse-specific location. If this resource, or type of
- * resource, isn't handled by this helper, return null.
- */
- public String getPortableName(IResource resource) {
- if (!(resource instanceof IFile)) {
- return null;
- }
-
- return "application-client.xml"; //$NON-NLS-1$
- }
-
- /**
- * Get the AppClient file for validation
- */
-
- public EObject loadApplicationClientFile() {
-
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- Archive archive = ((AppClientArtifactEdit) edit).asArchive(false);
- return archive;
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- return null;
- }
-
- public void closeApplicationClientFile() {
- if (appClientFile != null)
- appClientFile.close();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java
deleted file mode 100644
index 809f5c7..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jst.j2ee.internal.validation;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This singleton keeps an internal record of project dependencies. That is, every IProject can
- * depend on, and be depended on by, other IProjects. Ditto IJavaProject. This class is updated when
- * a project(s) classpath changes.
- */
-public final class DependencyUtil {
- private static final IProject[] EMPTY_PROJECTS = new IProject[0];
- private static final IJavaProject[] EMPTY_JAVAPROJECTS = new IJavaProject[0];
-
- private static Set _tempSet = null;
-
- /**
- * This is a set for temporary calculations.
- */
- private static Set getTempSet() {
- if (_tempSet == null) {
- _tempSet = new HashSet();
- } else {
- _tempSet.clear();
- }
- return _tempSet;
- }
-
- /**
- * Return an array of open IProjects which depend on the given IProject parameter.
- */
- public static IProject[] getDependentProjects(IProject project) {
- if (project == null) {
- return EMPTY_PROJECTS;
- }
-
- IProject[] allProjects = project.getWorkspace().getRoot().getProjects();
- Set tempSet = getTempSet();
- for (int i = 0; i < allProjects.length; i++) {
- IProject p = allProjects[i];
- IProject[] requires = getRequiredProjects(p);
- for (int j = 0; j < requires.length; j++) {
- IProject r = requires[j];
- if (project.equals(r)) {
- tempSet.add(p);
- break;
- }
- }
- }
- IProject[] dependency = new IProject[tempSet.size()];
- tempSet.toArray(dependency);
- return dependency;
- }
-
- /**
- * Return an array of open IProjects which the given IProject parameter depends on.
- */
- public static IProject[] getRequiredProjects(IProject project) {
- if (project == null) {
- return EMPTY_PROJECTS;
- }
-
- // Check that each project in this list exists and is open
- try {
- IProject[] refProjects = project.getReferencedProjects();
- if ((refProjects == null) || (refProjects.length == 0)) {
- return EMPTY_PROJECTS;
- }
-
- IProject[] temp = new IProject[refProjects.length];
- int count = 0;
- for (int i = 0; i < refProjects.length; i++) {
- IProject rProject = refProjects[i];
- if (rProject.exists() && rProject.isOpen()) {
- temp[count++] = rProject;
- }
- }
-
- if (count == 0) {
- return EMPTY_PROJECTS;
- }
-
- if (count == temp.length) {
- return temp;
- }
-
- IProject[] result = new IProject[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("DependencyCache::getRequiredProjects(" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
- }
-
- return EMPTY_PROJECTS;
- }
- }
-
- /**
- * Return an array of open IJavaProjects which depend on the given IJavaProject parameter.
- */
- public static IJavaProject[] getDependentJavaProjects(IJavaProject javaproject) {
- if (javaproject == null) {
- return EMPTY_JAVAPROJECTS;
- }
-
- // calculate the dependencies now.
- try {
- IJavaProject[] allProjects = javaproject.getJavaModel().getJavaProjects();
- Set tempSet = getTempSet();
- for (int i = 0; i < allProjects.length; i++) {
- IJavaProject p = allProjects[i];
- IJavaProject[] requires = getRequiredJavaProjects(p);
- for (int j = 0; j < requires.length; j++) {
- IJavaProject r = requires[j];
- if (javaproject.equals(r)) {
- tempSet.add(p);
- break;
- }
- }
- }
- IJavaProject[] dependency = new IJavaProject[tempSet.size()];
- tempSet.toArray(dependency);
- return dependency;
- } catch (JavaModelException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("DependencyCache::getDependentJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
- }
-
- return EMPTY_JAVAPROJECTS;
- }
- }
-
- /**
- * Return an array of open IJavaProjects which the given IJavaProject parameter depends on.
- */
- public static IJavaProject[] getRequiredJavaProjects(IJavaProject javaproject) {
- if (javaproject == null) {
- return EMPTY_JAVAPROJECTS;
- }
-
- try {
- IJavaModel jm = javaproject.getJavaModel();
- if (jm == null) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- //entry.setText("IJavaModel == null"); //$NON-NLS-1$
- logger.write(Level.SEVERE, "IJavaModel == null"); //$NON-NLS-1$
- }
- return EMPTY_JAVAPROJECTS;
- }
-
- String[] requiredProjects = javaproject.getRequiredProjectNames();
- if ((requiredProjects == null) || (requiredProjects.length == 0)) {
- return EMPTY_JAVAPROJECTS;
- }
-
- IJavaProject[] temp = new IJavaProject[requiredProjects.length];
- int count = 0;
- for (int i = 0; i < requiredProjects.length; i++) {
- String projectName = requiredProjects[i];
- IJavaProject jp = jm.getJavaProject(projectName);
- try {
- if ((jp == null) || (!jp.getProject().exists())) {
- continue;
- }
- if (!jp.getProject().isAccessible()) {
- continue;
- }
-
- if (!jp.getProject().hasNature(JavaCore.NATURE_ID)) {
- continue;
- }
-
- temp[count++] = jp;
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
- }
- continue;
- }
- }
-
- if (count == 0) {
- return EMPTY_JAVAPROJECTS;
- }
-
- if (count == temp.length) {
- return temp;
- }
-
- IJavaProject[] result = new IJavaProject[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- } catch (JavaModelException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
- }
-
- return EMPTY_JAVAPROJECTS;
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java
deleted file mode 100644
index 268778a..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java
+++ /dev/null
@@ -1,105 +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.jst.j2ee.internal.validation;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.model.internal.validation.EARMessageConstants;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-
-
-public class EarHelper extends J2EEValidationHelper {
-
- protected EARFile earFile;
- protected ArtifactEdit edit = null;
-
- /**
- * WarHelper constructor comment.
- */
- public EarHelper() {
- super();
-
- registerModel(EARMessageConstants.EAR_MODEL_NAME, "loadEarFile"); //$NON-NLS-1$
- }
-
- public String getApplicationXMLFile() {
-
- return J2EEConstants.APPL_ID;
- }
-
- /**
- * Given a resource, return its non-eclipse-specific location. If this resource, or type of
- * resource, isn't handled by this helper, return null.
- */
- public String getPortableName(IResource resource) {
- if (!(resource instanceof IFile)) {
- return null;
- }
-
- return "application.xml"; //$NON-NLS-1$
- }
-
- public String getTargetObjectName(Object obj) {
- super.getTargetObjectName(obj);
-
- if (obj != null && obj instanceof EARFile) {
- return getApplicationXMLFile();
- }
- if (obj != null && obj instanceof ApplicationImpl) {
- return "application.xml"; //$NON-NLS-1$
- }
- return null;
- }
-
- /**
- * Get the EAR file for validation
- */
-
- public EObject loadEarFile() {
-
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- edit = ComponentUtilities.getArtifactEditForRead(comp);
- try {
- Archive archive = ((EARArtifactEdit) edit).asArchive(false);
- earFile = (EARFile)archive;
- return archive;
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }
- return null;
- }
-
- public void cleanup(WorkbenchReporter reporter) {
- if (earFile != null) {
- earFile.close();
- earFile = null;
- }
- if (edit != null) {
- edit.dispose();
- edit = null;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/J2EEValidationHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/J2EEValidationHelper.java
deleted file mode 100644
index 43b9abf..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/J2EEValidationHelper.java
+++ /dev/null
@@ -1,107 +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.jst.j2ee.internal.validation;
-
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-
-
-public abstract class J2EEValidationHelper extends WorkbenchContext {
- /**
- * Constructor for J2EEValidationHelper.
- */
- public J2EEValidationHelper() {
- super();
- }
-
- /*
- * @see IWorkbenchContext#getFile(Object)
- */
- public IResource getResource(Object object) {
- Resource resource = null;
- if (object != null && object instanceof EObject)
- resource = ((EObject) object).eResource();
- if (resource != null)
- return WorkbenchResourceHelper.getFile(resource);
- return null;
- }
-
- /**
- * Given a resource, return its non-eclipse-specific location. If this resource, or type of
- * resource, isn't handled by this helper, return null.
- */
- protected String getFileName(IFile file, IContainer[] containers) {
- if ((file == null) || (containers == null)) {
- return null;
- }
-
- for (int c = 0; c < containers.length; c++) {
- IPath resourcePath = getContainerRelativePath(file, containers[c]);
- if (resourcePath != null) {
- // file has been found
- return resourcePath.toString();
- }
- }
-
- return null;
- }
-
- /**
- * Given a file name, return its corresponding IFile, if one exists. This method checks if the
- * IContainer passed in contains a file with the given file name. If the container does not have
- * the IFile, null is returned.
- */
- protected IFile getFile(String fileName, IContainer[] containers) {
- IFile clazzFile = null;
- if ((fileName == null) || (containers == null)) {
- return null;
- }
-
- for (int c = 0; c < containers.length; c++) {
- IContainer container = containers[c];
- IPath filePath = container.getProjectRelativePath();
- clazzFile = getProject().getFile(filePath.append(fileName));
-
- if (clazzFile.exists()) {
- return clazzFile;
- }
- }
-
- return null;
- }
-
-// protected IFile getXmlFile(String xmlFileName, J2EENature nature) {
-// if (nature == null) {
-// return null;
-// }
-// return nature.getMetaFolder().getFile(xmlFileName);
-// }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.operations.IWorkbenchContext#getTargetObjectName(java.lang.Object)
- */
- public String getTargetObjectName(Object object) {
- if (object != null)
- return object.toString();
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java
deleted file mode 100644
index d8ac09f..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java
+++ /dev/null
@@ -1,105 +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.jst.j2ee.internal.validation;
-
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ManifestLineValidator extends Object {
- public static final int MAX_LINE_LENGTH = 72;
- protected int lineNumber;
- protected int currentByte;
- protected int byteCount;
- protected InputStream inputStream;
- protected List lineNumbers;
- protected boolean endsWithLineBreak = true;
-
- /**
- * Constructor for LineValidator.
- */
- public ManifestLineValidator(InputStream in) {
- super();
- inputStream = new BufferedInputStream(in);
- lineNumber = 0;
- }
-
- protected List getLineNumbers() {
- if (lineNumbers == null)
- lineNumbers = new ArrayList();
- return lineNumbers;
- }
-
- public int[] getLineNumbersExceedingLimit() {
- if (lineNumbers == null)
- return new int[0];
-
- int[] result = new int[lineNumbers.size()];
- for (int i = 0; i < lineNumbers.size(); i++) {
- Integer list_element = (Integer) lineNumbers.get(i);
- result[i] = list_element.intValue();
- }
- return result;
- }
-
- public void validate() throws IOException {
- readNext();
- while (currentByte != -1) {
- validateNextLine();
- }
- }
-
- public int getLineCount() {
- return lineNumber;
- }
-
- protected void readNext() throws IOException {
- currentByte = inputStream.read();
- }
-
- protected void validateNextLine() throws IOException {
- lineNumber++;
- byteCount = 0;
- boolean eolReached = false;
- while (currentByte != -1) {
- if (currentByte == '\r') {
- eolReached = true;
- readNext();
- if (currentByte == '\n') {
- readNext();
- }
- break;
- } else if (currentByte == '\n') {
- eolReached = true;
- readNext();
- break;
- } else {
- byteCount++;
- readNext();
- }
- }
- if (currentByte == -1 && !eolReached && byteCount > 0)
- endsWithLineBreak = false;
- if (byteCount > 72)
- getLineNumbers().add(new Integer(lineNumber));
- }
-
- public boolean endsWithLineBreak() {
- return endsWithLineBreak;
- }
-
- public boolean hasErrors() {
- return !endsWithLineBreak || (lineNumbers != null && !lineNumbers.isEmpty());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java
deleted file mode 100644
index 4e5090f..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java
+++ /dev/null
@@ -1,86 +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.jst.j2ee.internal.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.IProjectValidationHelper;
-
-public class ProjectValidationHelper implements IProjectValidationHelper {
-
- private static IContainer[] EMPTY_RESULT = new IContainer[] {};
- private static ProjectValidationHelper INSTANCE;
- private IContainer[] outputs;
- private IContainer[] sources;
-
- public static ProjectValidationHelper getInstance(){
- if (INSTANCE == null)
- INSTANCE = new ProjectValidationHelper();
- return INSTANCE;
- }
- public void disposeInstance(){
- INSTANCE = null;
- }
- private IContainer[] getCachedOutputContainers(IProject project) {
- if (outputs != null)
- return outputs;
- if (project == null || JemProjectUtilities.getJavaProject(project)==null) {
- outputs = EMPTY_RESULT;
- return EMPTY_RESULT;
- }
- IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp == null || !comp.exists()) {
- outputs = EMPTY_RESULT;
- return EMPTY_RESULT;
- }
- outputs = J2EEProjectUtilities.getOutputContainers(project);
- return outputs;
-
- }
- public IContainer[] getOutputContainers(IProject project) {
- return getInstance().getCachedOutputContainers(project);
- }
-
- private IContainer[] getCachedSourceContainers(IProject project) {
- if (sources != null)
- return sources;
- if (project == null || JemProjectUtilities.getJavaProject(project)==null) {
- sources = EMPTY_RESULT;
- return EMPTY_RESULT;
- }
- IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp == null || !comp.exists()) {
- sources = EMPTY_RESULT;
- return EMPTY_RESULT;
- }
- IPackageFragmentRoot[] roots = J2EEProjectUtilities.getSourceContainers(project);
- List result = new ArrayList();
- for (int i=0; i<roots.length; i++) {
- if (roots[i].getResource() != null && roots[i].getResource() instanceof IContainer)
- result.add(roots[i].getResource());
- }
- sources = (IContainer[]) result.toArray(new IContainer[result.size()]);
- return sources;
-
- }
- public IContainer[] getSourceContainers(IProject project) {
- return getInstance().getCachedSourceContainers(project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java
deleted file mode 100644
index acb8bae..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jst.j2ee.internal.validation;
-
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.internal.adapters.jdom.JDOMAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.wst.validation.internal.operations.IResourceUtil;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class ResourceUtil implements IResourceUtil {
- public ResourceUtil() {
- super();
- }
-
- public int getLineNo(Object object) {
- if (object == null) {
- return IMessage.LINENO_UNSET;
- }
-
- if (object instanceof EObject) { // Error discovered using MOF objects
-
- EObject ro = (EObject) object;
- JDOMAdaptor jdomAdapter = null;
-
- Collection c = ro.eAdapters();
- if (c != null) {
- Iterator iterator = c.iterator();
- while (iterator.hasNext()) {
- Adapter a = (Adapter) iterator.next();
- if ((a != null) && a.isAdapterForType(ReadAdaptor.TYPE_KEY) && (a instanceof JDOMAdaptor)) {
- jdomAdapter = (JDOMAdaptor) a;
- }
- }
- }
-
- if (jdomAdapter != null) {
- int lineNo = jdomAdapter.getLineNo();
- if (lineNo != JDOMAdaptor.INVALID_LINENO)
- return lineNo + 1;
- }
-
- }
-
- return IMessage.LINENO_UNSET;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientHelper.java
deleted file mode 100644
index cb352c1..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientHelper.java
+++ /dev/null
@@ -1,27 +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.jst.j2ee.internal.validation;
-
-
-
-/**
- * Creates the helper for the WSAD application client validator.
- */
-public class UIApplicationClientHelper extends ApplicationClientHelper {
-
- /**
- * UIApplicationClientHelper
- */
- public UIApplicationClientHelper() {
- super();
- }// UIApplicationClientHelper
-
-}// UIApplicationClientHelper
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java
deleted file mode 100644
index 29bb967..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java
+++ /dev/null
@@ -1,25 +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.jst.j2ee.internal.validation;
-
-import org.eclipse.jst.j2ee.model.internal.validation.ApplicationClientMessageConstants;
-
-
-
-/**
- * Messages for the WSAD application client validator
- */
-public interface UIApplicationClientMessageConstants extends ApplicationClientMessageConstants {
-
- public static final String DOCTYPE_1_2 = "1.2"; //$NON-NLS-1$
- public static final String DOCTYPE_1_3 = "1.3"; //$NON-NLS-1$
- public static final String APPCLIENT_INVALID_DOC_TYPE_ERROR_ = "APPCLIENT_INVALID_DOC_TYPE_ERROR_"; //$NON-NLS-1$
-}// UIApplicationClientMessageConstants
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientValidator.java
deleted file mode 100644
index 8a29de7..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientValidator.java
+++ /dev/null
@@ -1,78 +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.jst.j2ee.internal.validation;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.ApplicationClientValidator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * Creates the application client validator for WSAD
- */
-public class UIApplicationClientValidator extends ApplicationClientValidator implements UIApplicationClientMessageConstants {
-
-
- /**
- * Default constructor.
- */
- public UIApplicationClientValidator() {
- super();
- }// UIApplicationClientValidator
-
-
- /**
- * Does the validation.
- */
-
- public void validate(IValidationContext inHelper, IReporter inReporter) throws org.eclipse.wst.validation.internal.core.ValidationException {
- UIApplicationClientHelper helper = (UIApplicationClientHelper) inHelper;
- IProject proj = ((IWorkbenchContext) inHelper).getProject();
- IVirtualComponent virComp = ComponentCore.createComponent(proj);
- if(J2EEProjectUtilities.isApplicationClientProject(proj)) {
- IVirtualFile ddFile = virComp.getRootFolder().getFile(J2EEConstants.APP_CLIENT_DD_URI);
- if( ddFile.exists()) {
- super.validate(helper, inReporter);
- }
- }
- //validateDocType(helper, editModel);
- }
-
-
- /**
- * Checks if the nature is consistent with doc type.
- */
-// protected void validateDocType(UIApplicationClientHelper helper, AppClientEditModel editModel) {
-// if (editModel.getJ2EENature().getJ2EEVersion() >= J2EEVersionConstants.J2EE_1_3_ID && getAppClientDD().getVersionID() < J2EEVersionConstants.J2EE_1_3_ID) {
-// String[] params = new String[3];
-// params[0] = DOCTYPE_1_2;
-// params[1] = helper.getProject().getName();
-// params[2] = DOCTYPE_1_3;
-// addError(getBaseName(), APPCLIENT_INVALID_DOC_TYPE_ERROR_, params);
-// } else if (editModel.getJ2EENature().getJ2EEVersion() < J2EEVersionConstants.J2EE_1_3_ID && getAppClientDD().getVersionID() >= J2EEVersionConstants.J2EE_1_3_ID) {
-// String[] params = new String[3];
-// params[0] = DOCTYPE_1_3;
-// params[1] = helper.getProject().getName();
-// params[2] = DOCTYPE_1_2;
-// addError(getBaseName(), APPCLIENT_INVALID_DOC_TYPE_ERROR_, params);
-// }// if
-// }// validateDocTypeVsNature
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java
deleted file mode 100644
index 623c8cb..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java
+++ /dev/null
@@ -1,27 +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.jst.j2ee.internal.validation;
-
-
-
-/**
- * Insert the type's description here. Creation date: (9/10/2001 2:12:47 PM)
- *
- * @author: Administrator
- */
-public class UIEarHelper extends EarHelper {
- /**
- * UIEarHelper constructor comment.
- */
- public UIEarHelper() {
- super();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarMessageConstants.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarMessageConstants.java
deleted file mode 100644
index 01d3189..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarMessageConstants.java
+++ /dev/null
@@ -1,49 +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.jst.j2ee.internal.validation;
-
-import org.eclipse.jst.j2ee.model.internal.validation.EARMessageConstants;
-
-
-
-/**
- * Insert the type's description here. Creation date: (9/10/2001 3:30:22 PM)
- *
- * @author: Administrator
- */
-public interface UIEarMessageConstants extends EARMessageConstants {
- public static final String DOCTYPE_1_2 = "1.2"; //$NON-NLS-1$
- public static final String DOCTYPE_1_3 = "1.3"; //$NON-NLS-1$
- public static final String MISSING_PROJECT_FORMODULE_WARN_ = "MISSING_PROJECT_FORMODULE_WARN_"; //$NON-NLS-1$
- public static final String PROJECT_DOES_NOT_EXIST_WARN_ = "PROJECT_DOES_NOT_EXIST_WARN_"; //$NON-NLS-1$
- public static final String MISSING_WEBNATURE_FORMODULE_WARN_ = "MISSING_WEBNATURE_FORMODULE_WARN_"; //$NON-NLS-1$
- public static final String MISSING_CLIENTNATURE_FORMODULE_WARN_ = "MISSING_CLIENTNATURE_FORMODULE_WARN_"; //$NON-NLS-1$
- public static final String MISSING_EJBNATURE_FORMODULE_WARN_ = "MISSING_EJBNATURE_FORMODULE_WARN_"; //$NON-NLS-1$
- public static final String DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_ = "DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_"; //$NON-NLS-1$
- public static final String INVALID_MANIFEST_CLASSPATH_ONE_WARN_ = "INVALID_MANIFEST_CLASSPATH_ONE_WARN_"; //$NON-NLS-1$
- public static final String INVALID_MANIFEST_CLASSPATH_TWO_WARN_ = "INVALID_MANIFEST_CLASSPATH_TWO_WARN_"; //$NON-NLS-1$
- public static final String INVALID_CONTEXTROOT_WEBMODULE_WARN_ = "INVALID_CONTEXTROOT_WEBMODULE_WARN_"; //$NON-NLS-1$
- public static final String INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_ = "INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_"; //$NON-NLS-1$
- public static final String INVALID_URI_FOR_MODULE_ERROR_ = "INVALID_URI_FOR_MODULE_ERROR_"; //$NON-NLS-1$
- public static final String PROJECT_IS_CLOSED_WARN_ = "PROJECT_IS_CLOSED_WARN_"; //$NON-NLS-1$
- public static final String INVALID_CASE_FOR_MANIFEST_ERROR_ = "INVALID_CASE_FOR_MANIFEST_ERROR_"; //$NON-NLS-1$
- public static final String MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_ = "MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_"; //$NON-NLS-1$
- public static final String MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_ = "MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_"; //$NON-NLS-1$
- public static final String DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_ = "DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_"; //$NON-NLS-1$
- public static final String EAR_INVALID_DOC_TYPE_ERROR_ = "EAR_INVALID_DOC_TYPE_ERROR_"; //$NON-NLS-1$
- public static final String URI_ALREADY_EXISTS_IN_EAR_WARN_ = "URI_ALREADY_EXISTS_IN_EAR_WARN_"; //$NON-NLS-1$
- public static final String PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR = "PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR"; //$NON-NLS-1$
- public static final String NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET = "NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET"; //$NON-NLS-1$
- public static final String NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS = "NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS";//$NON-NLS-1$
- public static final String INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL = "INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL";//$NON-NLS-1$
- public static final String INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL = "INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL";//$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java
deleted file mode 100644
index c77befa..0000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java
+++ /dev/null
@@ -1,611 +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.jst.j2ee.internal.validation;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-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.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ValidateXmlCommand;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ManifestException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.EarValidator;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-
-
-/**
- * Insert the type's description here. Creation date: (9/10/2001 2:11:02 PM)
- *
- * @author: Administrator
- */
-public class UIEarValidator extends EarValidator implements UIEarMessageConstants {
- public static final String VALIDATOR_ID = "org.eclipse.jst.j2ee.internal.validation.UIEarValidator"; //$NON-NLS-1$
- public static final String MANIFEST_GROUP_NAME = "WSAD.EAR.MANIFEST"; //$NON-NLS-1$
- protected UIEarHelper earHelper;
-// private EARArtifactEdit earEdit = null;
- private IProject project = null;
-
- /**
- * UIEarValidator constructor comment.
- */
- public UIEarValidator() {
- super();
- }
-
- public Command createValidateXMLCommand() {
-
- ValidateXmlCommand cmd = (ValidateXmlCommand) super.createValidateXMLCommand();
- cmd.setValidateNested(false);
- return cmd;
- }
-
- protected String getResourceName() {
- return ((EarHelper) _helper).getProject().getName();
- }
-
- protected void duplicateProjectMapError(String earProjectName, String moduleUri, String projectName) {
-
- String[] params = new String[3];
- params[0] = projectName;
- params[1] = earProjectName;
- params[2] = moduleUri;
- addError(getBaseName(), DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_, params, appDD);
- }
-
- /**
- *
- */
- protected void cleanUpSubTaskMessages(EObject ref) {
- String groupName = EJB_REF_GROUP_NAME;
- if (ref instanceof EjbRef)
- ref = (EjbRef) ref;
- else if (ref instanceof ResourceRef) {
- ref = (ResourceRef) ref;
- groupName = RES_REF_GROUP_NAME;
- } else if (ref instanceof ServiceRef) {
- ref = (ServiceRef) ref;
- groupName = SERVICE_REF_GROUP_NAME;
- } else if (ref instanceof ResourceEnvRef) {
- ref = (ResourceEnvRef) ref;
- groupName = RES_ENV_REF_GROUP_NAME;
- } else if (ref instanceof SecurityRoleRef) {
- ref = (SecurityRoleRef) ref;
- groupName = SEC_ROLE_REF_GROUP_NAME;
- } else if (ref instanceof MessageDestinationRef) {
- ref = (MessageDestinationRef) ref;
- groupName = MESSAGE_REF_GROUP_NAME;
- }
- Resource res = ref.eResource();
- if (res != null) {
- IFile file = WorkbenchResourceHelper.getFile(res);
- if (file != null)
- _reporter.removeMessageSubset(this, file, groupName);
- }
- }
-
- protected void cleanUpAllRefSubTaskMessages(Resource res) {
- if (res != null) {
- IFile file = WorkbenchResourceHelper.getFile(res);
- if (file != null)
- _reporter.removeMessageSubset(this, file, EJB_REF_GROUP_NAME);
- _reporter.removeMessageSubset(this, file, RES_REF_GROUP_NAME);
- _reporter.removeMessageSubset(this, file, SERVICE_REF_GROUP_NAME);
- _reporter.removeMessageSubset(this, file, SEC_ROLE_REF_GROUP_NAME);
- _reporter.removeMessageSubset(this, file, MESSAGE_REF_GROUP_NAME);
- _reporter.removeMessageSubset(this, file, RES_ENV_REF_GROUP_NAME);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (9/10/2001 2:56:32 PM)
- *
- * @return org.eclipse.wst.validation.internal.core.core.ear.workbenchimpl.UIEarHelper
- */
- public org.eclipse.jst.j2ee.internal.validation.UIEarHelper getEarHelper() {
- return earHelper;
- }
-
- protected void invalidClassPathEntryWarning(String entry, Archive anArchive) {
- String[] params = new String[2];
- params[0] = anArchive.getURI();
- params[1] = entry;
- addWarning(getBaseName(), INVALID_MANIFEST_CLASSPATH_ONE_WARN_, params, getManifestFile(anArchive), MANIFEST_GROUP_NAME);
- }
-
- protected void invalidClassPathEntryWarning(String entry, String resolvedEntry, Archive anArchive) {
- String[] params = new String[3];
- params[0] = anArchive.getURI();
- params[1] = entry;
- params[2] = resolvedEntry;
- addWarning(getBaseName(), INVALID_MANIFEST_CLASSPATH_TWO_WARN_, params, getManifestFile(anArchive), MANIFEST_GROUP_NAME);
- }
-
- protected void invalidDepedencyWarning(String entry, Archive anArchive, ModuleFile m) {
- String[] params = new String[3];
- params[0] = m.getURI();
- params[1] = entry;
- params[2] = anArchive.getURI();
- addWarning(getBaseName(), INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_, params, getManifestFile(anArchive), MANIFEST_GROUP_NAME);
- }
-
- /**
- * Insert the method's description here. Creation date: (9/10/2001 2:56:32 PM)
- *
- * @param newEarHelper
- * org.eclipse.wst.validation.internal.core.core.ear.workbenchimpl.UIEarHelper
- */
- public void setEarHelper(org.eclipse.jst.j2ee.internal.validation.UIEarHelper newEarHelper) {
- earHelper = newEarHelper;
- }
-
- public void validate(IValidationContext inHelper, IReporter inReporter) throws org.eclipse.wst.validation.internal.core.ValidationException {
- earHelper = ((UIEarHelper) inHelper);
- IProject proj = ((IWorkbenchContext) inHelper).getProject();
- IVirtualComponent earModule = ComponentCore.createComponent(proj);
- if(J2EEProjectUtilities.isEARProject(proj)){
- IVirtualFile ddFile = earModule.getRootFolder().getFile(J2EEConstants.APPLICATION_DD_URI);
- if( ddFile.exists()) {
- super.validate(inHelper, inReporter);
- validateModuleMaps(earModule);
- validateManifests();
- // validateUtilJarMaps(earEdit,earModule);
- // validateUriAlreadyExistsInEar(earEdit,earModule);
- // validateDocType(earEdit,earModule);
- }
- }
-
- }
-
-
-
- public void validateManifests() throws ValidationException {
-
- if (earFile == null)
- return;
- List archives = earFile.getArchiveFiles();
- for (int i = 0; i < archives.size(); i++) {
- try {
- Archive anArchive = (Archive) archives.get(i);
-
- IFile target = getManifestFile(anArchive);
- if (target != null)
- _reporter.removeMessageSubset(this, target, MANIFEST_GROUP_NAME);
- validateManifestCase(anArchive);
- validateManifestLines(anArchive);
- validateManifestClasspath(anArchive);
-
- } catch (MessageLimitException me) {
- }
- }
- }
-
- public void validateManifestCase(Archive anArchive) {
- String mfuri = J2EEConstants.MANIFEST_URI;
-
- //Indicates a manifest file with the valid name exists,
- //nothing left to do
- if (anArchive.containsFile(mfuri))
- return;
-
- //Otherwise iterate the list of files
- //Ensure the archive is read-only first
- anArchive.getOptions().setIsReadOnly(true);
- List files = anArchive.getFiles();
- String uri = null;
- for (int i = 0; i < files.size(); i++) {
- File aFile = (File) files.get(i);
- uri = aFile.getURI();
- if (mfuri.equalsIgnoreCase(uri) && !mfuri.equals(uri)) {
- String[] params = {uri, anArchive.getURI()};
- IResource target = earHelper.getProject().getFile(J2EEConstants.MANIFEST_URI);
- addError(getBaseName(), INVALID_CASE_FOR_MANIFEST_ERROR_, params, target);
- }
- }
-
- }
-
-
- public void validateManifestClasspath(Archive anArchive) throws ValidationException {
- ArchiveManifest manifest = null;
- try{
- manifest = anArchive.getManifest();
- }catch( ManifestException mf){
- //mf.printStackTrace();
- mf.getMessage();
- String[] args = new String[]{anArchive.getURI()};
- addError(ERROR_READING_MANIFEST_ERROR_, args);
- }
-
- if(manifest == null)
- return;
-
- String[] cp = manifest.getClassPathTokenized();
-
- for (int i = 0; i < cp.length; i++) {
- String uri = ArchiveUtil.deriveEARRelativeURI(cp[i], anArchive);
- if (uri == null) {
- invalidClassPathEntryWarning(cp[i], anArchive);
- continue;
- }
- File f = null;
- //IFile rf = null;
- try {
-// if (uri.endsWith(J2EEImportConstants.IMPORTED_JAR_SUFFIX)) {
- //TODO Needs work here to initialize rf as rf is an IFile and there is no way to get an IFile currently
-// IVirtualResource resource = component.getRootFolder().findMember(new Path(uri));
-// if (resource == null || !resource.exists()) {
-// invalidClassPathEntryWarning(cp[i], uri, anArchive);
-// }
-// }
-// else
- f = earFile.getFile(uri);
- } catch (java.io.FileNotFoundException ex) {
- invalidClassPathEntryWarning(cp[i], earFile.getURI(), anArchive);
- continue;
- }
- if (f != null && f.isArchive() && anArchive.isModuleFile()) {
- Archive archive = (Archive) f;
- ModuleFile m = (ModuleFile) anArchive;
- if (!ArchiveUtil.isValidDependency(archive, m))
- invalidDepedencyWarning(cp[i], archive, m);
- }
- }
- }
-
-
- protected void validateManifestLines(Archive anArchive) throws ValidationException {
- if (anArchive == null)
- return;
- InputStream is = null;
- try {
- is = anArchive.getInputStream(J2EEConstants.MANIFEST_URI);
- ManifestLineValidator lineVal = new ManifestLineValidator(is);
- lineVal.validate();
- addErrorsIfNecessary(anArchive, lineVal);
- } catch (FileNotFoundException ex) {
- return;
- } catch (IOException ex) {
- handleManifestException(ex, anArchive);
- } finally {
- if (is != null)
- try {
- is.close();
- } catch (IOException ex) {
- handleManifestException(ex, anArchive);
- }
- }
- }
-
- protected void addErrorsIfNecessary(Archive anArchive, ManifestLineValidator mfVal) {
- if (!mfVal.hasErrors())
- return;
- IFile target = getManifestFile(anArchive);
- if (!mfVal.endsWithLineBreak())
- addFileEndError(anArchive, mfVal, target);
- int[] lines = mfVal.getLineNumbersExceedingLimit();
- for (int i = 0; i < lines.length; i++) {
- addLineLengthError(anArchive, target, lines[i]);
- }
- }
-
- protected void addLineLengthError(Archive anArchive, IFile target, int lineNo) {
- String[] args = new String[2];
- args[0] = Integer.toString(lineNo);
- args[1] = anArchive.getURI();
- if (target != null)
- addError(getBaseName(), MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_, args, target, MANIFEST_GROUP_NAME, lineNo);
- else
- addError(getBaseName(), MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_, args, null, MANIFEST_GROUP_NAME);
- }
-
- protected void addFileEndError(Archive anArchive, ManifestLineValidator mfVal, IFile target) {
- String[] args = new String[]{anArchive.getURI()};
- if (target != null)
- addError(getBaseName(), MANIFEST_LINE_END_ERROR_, args, getManifestFile(anArchive), MANIFEST_GROUP_NAME, mfVal.getLineCount());
- else
- addError(getBaseName(), MANIFEST_LINE_END_ERROR_, args, MANIFEST_GROUP_NAME);
- }
-
- protected void handleManifestException(IOException ex, Archive anArchive) throws ValidationException {
- Logger.getLogger().logError(ex);
- IMessage message = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_READING_MANIFEST_ERROR_, new String[]{anArchive.getURI()});
- throw new ValidationException(message, ex);
- }
-
- /**
- * Validates utiljar maps
- */
-// public void validateUtilJarMaps(EARArtifactEdit edit, IVirtualComponent workbenchModule) {
-// List utilJarModules = edit.getUtilityModuleReferences();
-// if (!utilJarModules.isEmpty() || !utilJarModules.isEmpty()) {
-// for (int i = 0; i < utilJarModules.size(); i++) {
-// IVirtualComponent aUtilJar = ((IVirtualReference) utilJarModules.get(i)).getReferencedComponent();
-// if (aUtilJar != null) {
-// IProject project = J2EEPlugin.getWorkspace().getRoot().getProject(aUtilJar.getProject().getName());
-// if (project != null) {
-// if (!project.exists()) {
-// String[] params = new String[]{project.getName(), aUtilJar.getRuntimePath().toString(), earHelper.getProject().getName()};
-// addWarning(getBaseName(), PROJECT_DOES_NOT_EXIST_WARN_, params);
-// } else {
-// //validateModuleProjectForValidServerTarget(project);
-// if (!project.isOpen()) {
-// String[] params = new String[]{project.getName()};
-// addWarning(getBaseName(), PROJECT_IS_CLOSED_WARN_, params);
-// }
-// }
-// }
-// }
-// }
-// }
-// validateDuplicateUtilJars(edit,workbenchModule);
-// validateUtilJarNameCollision(edit,workbenchModule);
-// validateUtilJarContainsNoSpaces(edit,workbenchModule);
-//
-// }// validateUtilJarMaps
-
- /**
- * Checks if the util jar contains spaces or not.
- *
- * @param EAREditModel
- * earEditModel - The ear editmodel.
- */
- protected void validateUtilJarContainsNoSpaces(EARArtifactEdit edit, IVirtualComponent module) {
- IVirtualReference[] utilJars = edit.getUtilityModuleReferences();
-
- if (utilJars == null)
- return;
-
- for (int i = 0; i < utilJars.length; i++) {
- IVirtualReference utilModule = utilJars[i];
- if (utilModule != null) {
- String uri = ModuleURIUtil.fullyQualifyURI(project).toString();
- if (uri != null && uri.indexOf(" ") != -1) { //$NON-NLS-1$
- String[] params = new String[1];
- params[0] = uri;
- addError(getBaseName(), URI_CONTAINS_SPACES_ERROR_, params, appDD);
- }// if
- }// if
- }// for
-
- }// validateUtilJarContainsNoSpaces
-
- /**
- * Validates if the a util jar has the same name as another module.
- *
- * @param EAREditModel
- * earEditModel - The ear editmodel.
- */
-// protected void validateUtilJarNameCollision(EARArtifactEdit edit, IVirtualComponent module) {
-// List utilJars = edit.getUtilityModuleReferences();
-// if (utilJars == null)
-// return;
-// for (int i = 0; i < utilJars.size(); i++) {
-// UtilityJARMapping utilModule = (UtilityJARMapping) utilJars.get(i);
-//
-// if (utilModule != null) {
-// if (edit.uriExists(utilModule.getUri())) {
-//
-// String[] params = new String[]{utilModule.getUri(), module.getName()};
-// addError(getBaseName(), MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_, params);
-//
-// } else if (utilModule.getProjectName() != null || utilModule.getProjectName().length() != 0) {
-// if (edit.uriExists(utilModule.getUri())) {
-// String[] params = new String[]{utilModule.getUri(), utilModule.getProjectName()};
-// addError(getBaseName(), MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_, params);
-// }
-// }
-// }
-// }
-// }
-
-
-
- /**
- * validate is there are duplicate util jars.
- *
- * @param EAREditModel
- * earEditModel - The ear editmodel
- */
- protected void validateDuplicateUtilJars(EARArtifactEdit edit, IVirtualComponent module) {
- IVirtualReference[] utilJars = edit.getUtilityModuleReferences();
- Set visitedUtilUri = new HashSet();
- if (utilJars == null)
- return;
- for (int i = 0; i < utilJars.length; i++) {
- IVirtualReference utilModule = utilJars[i];
- if (utilModule != null) {
- String uri = ModuleURIUtil.fullyQualifyURI(project).toString();
- if (visitedUtilUri.contains(uri)) {
- String compName = module.getName();
- duplicateUtilError(module.getName(),uri, compName);
- } else
- visitedUtilUri.add(uri);
- } // if
- } // for
- } // validateModuleMapsDuplicateUtil
-
- /**
- * Creates an error for duplicate util jars.
- *
- * @param String
- * earProjectName - The ears project name.
- * @param String
- * moduleUri - The modules uri.
- * @param String
- * projectName - The project name.
- */
- protected void duplicateUtilError(String earProjectName, String moduleUri, String projectName) {
- String[] params = new String[3];
- params[0] = projectName;
- params[1] = earProjectName;
- params[2] = moduleUri;
- addError(getBaseName(), DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_, params);
- }// duplicateUtilError
-
- public void validateModuleMaps(IVirtualComponent component) {
- IVirtualFile ddFile = component.getRootFolder().getFile(J2EEConstants.APPLICATION_DD_URI);
- if( ddFile.exists()){
- EList modules = appDD.getModules();
- if (!modules.isEmpty()) {
- EARArtifactEdit edit = null;
- try{
- edit = EARArtifactEdit.getEARArtifactEditForRead( component.getProject() );
-
- for (int i = 0; i < modules.size(); i++) {
- Module module = (Module) modules.get(i);
- String uri = module.getUri();
- IVirtualComponent referencedComp = edit.getModule( uri );
- if( referencedComp == null ){
- String[] params = new String[]{uri, component.getProject().getName()};
- addWarning(getBaseName(), MISSING_PROJECT_FORMODULE_WARN_, params);
- }
- //validateModuleURIExtension(module);
- }
- }finally{
- if( edit != null )
- edit.dispose();
- }
- }
- }
- }
-
-
- protected void validateModuleURIExtension(Module module) {
- String newUri = module.getUri();
- if (newUri != null && newUri.length() > 0) {
- if (module instanceof EjbModule && !newUri.endsWith(".jar")) { //$NON-NLS-1$
- String[] params = new String[1];
- params[0] = module.getUri();
- IResource target = earHelper.getProject().getFile(ArchiveConstants.APPLICATION_DD_URI);
- addWarning(getBaseName(), INVALID_URI_FOR_MODULE_ERROR_, params, target);
- } else if (module instanceof WebModule && !newUri.endsWith(".war")) { //$NON-NLS-1$
- String[] params = new String[1];
- params[0] = module.getUri();
- IResource target = earHelper.getProject().getFile(ArchiveConstants.APPLICATION_DD_URI);
- addWarning(getBaseName(), INVALID_URI_FOR_MODULE_ERROR_, params, target);
- }
- }
- }
-
-
- protected IFile getManifestFile(Archive anArchive) {
- URIConverter conv = anArchive.getResourceSet().getURIConverter();
- if (conv instanceof WorkbenchURIConverter) {
- WorkbenchURIConverter wbConv = (WorkbenchURIConverter) conv;
- IContainer input = wbConv.getInputContainer();
- if (input == null)
- return null;
- IProject p = input.getProject();
- if (p == null || JemProjectUtilities.isBinaryProject(p))
- return null;
- IFile result = J2EEProjectUtilities.getManifestFile(p);
- if (result != null && result.exists())
- return result;
- }
- return null;
- }
-
- /**
- * Checks if the nature is consistent with doc type.
- */
- protected void validateDocType(EARArtifactEdit edit,IVirtualComponent module) {
- if (edit == null)
- return;
- if (edit.getJ2EEVersion() >= J2EEVersionConstants.J2EE_1_3_ID && appDD.getVersionID() < J2EEVersionConstants.J2EE_1_3_ID) {
- String[] params = new String[3];
- params[0] = DOCTYPE_1_2;
- params[1] = getResourceName();
- params[2] = DOCTYPE_1_3;
- addError(getBaseName(), EAR_INVALID_DOC_TYPE_ERROR_, params, appDD);
- } else if (edit.getJ2EEVersion() < J2EEVersionConstants.J2EE_1_3_ID && appDD.getVersionID() >= J2EEVersionConstants.J2EE_1_3_ID) {
- String[] params = new String[3];
- params[0] = DOCTYPE_1_3;
- params[1] = getResourceName();
- params[2] = DOCTYPE_1_2;
- addError(getBaseName(), EAR_INVALID_DOC_TYPE_ERROR_, params, appDD);
- }
- }
-
- /**
- * Validates that conflicting jar does not exist in the ear project.
- */
- public void validateUriAlreadyExistsInEar(EARArtifactEdit edit,IVirtualComponent component) {
- IVirtualReference[] modules = edit.getJ2EEModuleReferences();
- if (modules == null)
- return;
- for (int i = 0; i < modules.length; i++) {
- IVirtualReference reference = modules[i];
- IVirtualComponent module = reference.getReferencedComponent();
- if (module != null && module.getRootFolder().getRuntimePath() != null) {
- IProject currentEARProject = earHelper.getProject();
- try {
- IFile exFile = currentEARProject.getFile(module.getRootFolder().getRuntimePath());
- if (exFile != null && exFile.exists()) {
- String[] params = new String[2];
- params[0] = module.getRootFolder().getRuntimePath().toString();
- params[1] = currentEARProject.getName();
- addWarning(getBaseName(), URI_ALREADY_EXISTS_IN_EAR_WARN_, params, appDD);
- }
- } catch (IllegalArgumentException iae) {
- Logger.getLogger().logError(iae);
- }
- }
- }
- }
-
-}// UIEarValidator
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.properties b/plugins/org.eclipse.jst.j2ee/plugin.properties
deleted file mode 100644
index 462a2e4..0000000
--- a/plugins/org.eclipse.jst.j2ee/plugin.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-ear_validator_UI_=EAR Validator
-war_validator_UI_=WAR Validator
-application_client_validator_UI_=Application Client Validator
-validation_UI_=Migration Of Validation
-_UI_ParamValue_type=Param:
-EAR_VALIDATION_PROBLEMMARKER_NAME=EAR Validator Message
-EAR_FACET_LABEL=EAR
-EAR_FACET_DESCRIPTION=Enables the project to be deployed as an EAR module.
-EAR_FACET_TEMPLATE=EAR Project
-UTILITY_FACET_LABEL=Utility Module
-UTILITY_FACET_DESCRIPTION=Enables the project to be referenced by J2EE modules.
-UTILITY_FACET_TEMPLATE=Java Utility Project
-APPCLIENT_FACET_LABEL=Application Client module
-APPCLIENT_FACET_DESCRIPTION=Enables the project to be deployed as a J2EE Application Client module.
-APPCLIENT_FACET_TEMPLATE=Application Client Project
-
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
deleted file mode 100644
index e5ec585..0000000
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ /dev/null
@@ -1,735 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!-- Extension point to register specialized edit models with the EJBNature -->
-<!-- Extension point to register specialized EJB commands -->
- <extension-point id="EJBCommandExtension" name="EJBCommandExtension" schema="schema/EJBCommandExtension.exsd"/>
-<!--============================-->
-<!-- Codegen Contributions -->
-<!--============================-->
-
-<!-- This extension-point sends notification to all extensions when J2EEModules are imported.
- Each extension can specify a set of different module types to listen for or listen to them
- all. The default is to receive notification for all module types. Notification is sent
- to the specified class implementing org.eclipse.jst.j2ee.internal.J2EEModulePostImportHandler
-
- Both of the following examples register for notification for all J2EEModule types, the first
- uses the defaults, while the second specifies each module type. To listen for only specific
- module types, use the second example and specify only the types to listen to.
-
- <extension point="org.eclipse.jst.j2ee.internal.J2EEModulePostImport">
- <postImport className="org.eclipse.jst.j2ee.internal.tests.extensions.ModulePostImportTestDefault"></postImport>
- </extension>
-
- <extension point="org.eclipse.jst.j2ee.internal.J2EEModulePostImport">
- <postImport className="org.eclipse.jst.j2ee.internal.tests.extensions.ModulePostImportTestAll"></postImport>
- <module type="WEB"></module>
- <module type="EJB"></module>
- <module type="ApplicationClient"></module>
- <module type="Connector"></module>
- </extension>
- -->
- <extension-point id="J2EEModulePostImport" name="J2EEModulePostImport" schema="schema/J2EEModulePostImport.exsd"/>
-
- <extension-point id="EARModuleExtension" name="EARModuleExtension" schema="schema/EARModuleExtension.exsd"/>
- <extension-point id="DeployerExtension" name="J2EE Deployer Extension" schema="schema/DeployerExtension.exsd"/>
- <extension-point id="resourceEnvRefType" name="Resource Environment Reference Type" schema="schema/resourceEnvRefType.exsd"/>
- <extension-point id="resourceRefType" name="Resource Reference Type" schema="schema/resourceRefType.exsd"/>
- <extension-point id="WebServiceClientGenerator" name="WebServiceClientGenerator" schema="schema/WebServiceClientGenerator.exsd"/>
- <extension-point id="ExtendedModuleImport" name="ExtendedModuleImport" schema="schema/ExtendedModuleImport.exsd"/>
- <extension-point id="WSDLServiceHelper" name="WSDLServiceHelper" schema="schema/WSDLServiceHelper.exsd"/>
-
-<!--============================-->
-<!-- Module Core Nature -->
-<!--============================-->
-
- <extension
- id="ModuleCoreNature"
- name="Module Core Properties"
- point="org.eclipse.core.resources.natures">
- <runtime>
- <run
- class="org.eclipse.wst.common.componentcore.ComponentCore">
- </run>
- </runtime>
- </extension> -->
- <!-- Register the nature id with the EMFNature -->
- <extension
- point="org.eclipse.jem.util.nature_registration">
- <nature
- id="org.eclipse.jst.j2ee.ModuleCore">
- </nature>
- </extension>
-
-
-
-
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.ear"
- factoryClass="org.eclipse.wst.common.componentcore.internal.impl.ArtifactEditModelFactory">
- <editModelResource
- autoload="false"
- URI="META-INF/application.xml"/>
- </editModel>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.artifactedit">
- <artifactedit
- typeID="jst.ear"
- class="org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit">
- </artifactedit>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.appclient"
- factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
- <editModelResource
- autoload="false"
- URI="META-INF/application-client.xml"/>
- </editModel>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.artifactedit">
- <artifactedit
- typeID="jst.appclient"
- class="org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit">
- </artifactedit>
- </extension>
-
-<!--===================================================-->
-<!-- Register known J2EE DTDs and XSDs for XML editor -->
-<!-- DTD and XSD Contributions -->
-<!--===================================================-->
-<extension
- point="org.eclipse.wst.internet.cache.cacheresource">
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/dtd/web-app_2_3.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/j2ee/dtds/application-client_1_2.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/dtd/application-client_1_3.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/j2ee/dtds/application_1_2.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/dtd/application_1_3.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/dtd/ejb-jar_2_0.dtd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"/>
- <cacheresource
- license="http://developers.sun.com/license/berkeley_license.html"
- url="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/>
-
- </extension>
-
-
-<!-- <extension
- point="org.eclipse.wst.xml.uriresolver.catalogContributor">
- <catalogContributor
- catalogId="default">
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- uri="dtds/web-app_2_2.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- uri="dtds/web-app_2_3.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN"
- uri="dtds/application-client_1_2.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"
- uri="dtds/application-client_1_3.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN"
- uri="dtds/application_1_2.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
- uri="dtds/application_1_3.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
- uri="dtds/ejb-jar_1_1.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
- uri="dtds/ejb-jar_2_0.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"
- uri="dtds/connector_1_0.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
- uri="dtds/web-jsptaglibrary_1_1.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- uri="dtds/web-jsptaglibrary_1_2.dtd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- uri="xsds/application-client_1_4.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
- uri="xsds/application_1_4.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- uri="xsds/connector_1_5.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
- uri="xsds/ejb-jar_2_1.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/"
- uri="xsds/j2ee_1_4.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"
- uri="xsds/jsp_2_0.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- uri="xsds/web-app_2_4.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- uri="xsds/web-jsptaglibrary_2_0.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- uri="xsds/j2ee_jaxrpc_mapping_1_1.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- uri="xsds/j2ee_web_services_1_1.xsd">
- </mappingInfo>
- <mappingInfo
- key="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
- uri="xsds/j2ee_web_services_client_1_1.xsd">
- </mappingInfo>
- <mappingInfo
- key="-//W3C//DTD XMLSCHEMA 200102//EN"
- uri="dtds/XMLSchema.dtd">
- </mappingInfo>
- <mappingInfo
- key="datatypes"
- uri="dtds/datatypes.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//IBM Corporation, Inc.//DTD J2EE JAX-RPC mapping 1.0//EN"
- uri="dtds/j2ee_jaxrpc_mapping_1_0.dtd ">
- </mappingInfo>
- <mappingInfo
- key="-//IBM Corporation, Inc.//DTD J2EE Web services 1.0//EN"
- uri="dtds/j2ee_web_services_1_0.dtd">
- </mappingInfo>
- <mappingInfo
- key="-//IBM Corporation, Inc.//DTD J2EE Web services client 1.0//EN"
- uri="dtds/j2ee_web_services_client_1_0.dtd">
- </mappingInfo>
- </catalogContributor>
- </extension> -->
-<!--=================================-->
-<!-- LibCopy Builder Contributions -->
-<!--=================================-->
- <extension
- id="LibCopyBuilder"
- name="Library Copying Builder"
- point="org.eclipse.core.resources.builders">
- <builder>
- <run
- class="org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder">
- </run>
- </builder>
- </extension>
- <extension
- id="EarValidator"
- name="%ear_validator_UI_"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <projectNature
- id="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </projectNature>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.xml">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.xmi">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jar">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter=".modulemaps">
- </filter>
- <dependentValidator
- depValValue="true">
- </dependentValidator>
- <markerId
- markerIdValue="EARValidatorMarker">
- </markerId>
- <run
- class="org.eclipse.jst.j2ee.internal.validation.UIEarValidator">
- </run>
- <helper
- class="org.eclipse.jst.j2ee.internal.validation.UIEarHelper">
- </helper>
- </validator>
- </extension>
- <extension
- id="EARValidatorMarker"
- name="%EAR_VALIDATION_PROBLEMMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.wst.validation.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- <attribute
- name="validationSeverity">
- </attribute>
- <attribute
- name="targetObject">
- </attribute>
- <attribute
- name="groupName">
- </attribute>
- <attribute
- name="messageId">
- </attribute>
- </extension>
- <extension
- id="ApplicationClientValidator"
- name="%application_client_validator_UI_"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <projectNature
- id="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </projectNature>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="MANIFEST.MF">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="application-client.xml">
- </filter>
- <dependentValidator
- depValValue="true">
- </dependentValidator>
- <helper
- class="org.eclipse.jst.j2ee.internal.validation.UIApplicationClientHelper">
- </helper>
- <run
- class="org.eclipse.jst.j2ee.internal.validation.UIApplicationClientValidator">
- </run>
- </validator>
- </extension>
-<!--ModuleMapInit-->
-<!--============================-->
-<!-- J2EE Extension Point Registry-->
-<!--============================-->
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="modulemap.xmi"
- class="org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage">
- </package>
- </extension>
-<!-- ====================================================== -->
-<!-- Register package mappings -->
-<!-- Several that have not changed are still registered as -->
-<!-- a place holder for the future. -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.wst.common.emf.packageURIMap">
- <map
- uri="modulemap.xmi"
- prefix="modulemap">
- </map>
- </extension>
-<!-- ====================================================== -->
-<!-- Extendable Operations -->
-<!-- These operation are extendable in other plugins -->
-<!-- ====================================================== -->
-
- <extension
- name="J2EE tools function group"
- point="org.eclipse.wst.common.frameworks.functionGroup">
- <functionGroup
- initializerClassName="org.eclipse.jst.j2ee.internal.plugin.J2EEGroupInitializer"
- name="J2EE Core tools"
- functionGroupID="org.eclipse.jst.j2ee"
- priority="0"
- description="J2EE Core tools">
- </functionGroup>
- <functionGroupPatternBinding
- functionGroupID="org.eclipse.jst.j2ee"
- pattern="org.eclipse.jst.j2ee.*">
- </functionGroupPatternBinding>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.common.internal.provider.CommonItemProviderAdapterFactory"
- packageURI="common.xmi"
- id="org.eclipse.jst.j2ee.common.internal.provider.CommonItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProviderAdapterFactory"
- packageURI="application.xmi"
- id="org.eclipse.jst.j2ee.application.provider.ApplicationItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.provider.ClientItemProviderAdapterFactory"
- packageURI="client.xmi"
- id="org.eclipse.jst.j2ee.client.provider.ClientItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.provider.ModulemapItemProviderAdapterFactory"
- packageURI="modulemap.xmi"
- id="org.eclipse.jst.j2ee.ear.modulemap.provider.ModulemapItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- className="org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory"
- packageURI="org.eclipse.emf.ecore.resource"
- id="org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
-
-
-
-
-<!-- =============================================================== -->
-<!-- Purpose: Define the default deployable project factory -->
-<!-- Extension point: com.ibm.etools.server.core.deployableFactories -->
-<!-- =============================================================== -->
- <extension
- point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- projects="true"
- class="org.eclipse.jst.j2ee.internal.deployables.J2EEDeployableFactory"
- id="org.eclipse.jst.j2ee.server">
- <moduleType
- versions="*"
- types="jst.ear, jst.appclient, jst.web, jst.ejb, jst.connector, jst.utility">
- </moduleType>
- </moduleFactory>
- </extension>
-
-<!-- =============================================================== -->
-<!-- WTP Operation extendable operations -->
-<!-- -->
-<!-- =============================================================== -->
-
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider"
- id="org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider"/>
- </extension>
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.ear">
- <label>%EAR_FACET_LABEL</label>
- <description>%EAR_FACET_DESCRIPTION</description>
- <icon>icons/EAR.gif</icon>
- </project-facet>
-
- <project-facet-version facet="jst.ear" version="1.2">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/>
- </action>
-<!-- <action type="version-change">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetVersionChangeDelegate"/>
- </action> -->
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <conflicts group="modules"/>
- <conflicts group="java"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- <group-member id="java"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ear" version="1.3">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/>
- </action>
- <!-- <action type="version-change">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetVersionChangeDelegate"/>
- </action> -->
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <conflicts group="modules"/>
- <conflicts group="java"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- <group-member id="java"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ear" version="1.4">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/>
- </action>
- <!-- <action type="version-change">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetVersionChangeDelegate"/>
- </action> -->
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <conflicts group="modules"/>
- <conflicts group="java"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- <group-member id="java"/>
- </project-facet-version>
-
- <project-facet id="jst.utility">
- <label>%UTILITY_FACET_LABEL</label>
- <description>%UTILITY_FACET_DESCRIPTION</description>
- </project-facet>
-
- <project-facet-version facet="jst.utility" version="1.0">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider"/>
- </action>
- <action type="uninstall">
- <delegate class="org.eclipse.jst.j2ee.project.facet.UtilityFacetUnInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
-
- <project-facet id="jst.appclient">
- <label>%APPCLIENT_FACET_LABEL</label>
- <description>%APPCLIENT_FACET_DESCRIPTION</description>
- <icon>icons/ear.gif</icon>
- </project-facet>
-
- <project-facet-version facet="jst.appclient" version="1.2">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.appclient" version="1.3">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.appclient" version="1.4">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
-
- <template id="template.jst.ear">
- <label>%EAR_FACET_TEMPLATE</label>
- <fixed facet="jst.ear"/>
- </template>
-
- <template id="template.jst.utility">
- <label>%UTILITY_FACET_TEMPLATE</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.utility"/>
- </template>
-
- <template id="template.jst.appclient">
- <label>%APPCLIENT_FACET_TEMPLATE</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.appclient"/>
- </template>
-
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.validators">
- <validator class="org.eclipse.jst.j2ee.project.facet.EarFacetValidator"/>
- </extension>
-
- <extension
- point="org.eclipse.core.resources.markers"
- id="differentRuntimesDetected">
- <super type="org.eclipse.wst.common.project.facet.core.validation.marker"/>
- <attribute name="moduleProject"/>
- <attribute name="runtime1"/>
- <attribute name="runtime2"/>
- <persistent value="true"/>
- </extension>
-
- <extension
- point="org.eclipse.wst.validation.validationHelper">
- <validationHelper
- id="org.eclipse.jst.common.componentcore.util.ProjectValidationHelper"
- helperClass="org.eclipse.jst.j2ee.internal.validation.ProjectValidationHelper">
- </validationHelper>
- </extension>
-
- <!--
- Operation extension that updates the context-root entries in application.xml
- -->
- <extension
- point="org.eclipse.wst.common.frameworks.OperationExtension"
- id="org.eclipse.jst.j2ee.application.internal.operations.UpdateContextRoot">
- <operationExtension
- id="org.eclipse.wst.web.internal.operation.WebProjectPropertiesUpdateOperation"
- preOperationClass="org.eclipse.jst.j2ee.application.internal.operations.ComputeEARsForContextRootUpdateOp"/>
- <operationExtension
- id="org.eclipse.wst.web.internal.operation.WebProjectPropertiesUpdateOperation"
- postOperationClass="org.eclipse.jst.j2ee.application.internal.operations.UpdateModuleContextRootInEAROp"/>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee/prepareAllPII.xml b/plugins/org.eclipse.jst.j2ee/prepareAllPII.xml
deleted file mode 100644
index 8b0550b..0000000
--- a/plugins/org.eclipse.jst.j2ee/prepareAllPII.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<project name="Build" default="All" basedir=".">
-
-<target name="com.ibm.etools.ejb.ui">
- <echo message="com.ibm.etools.ejb.ui..."/>
- <ant antfile="../com.ibm.etools.ejb.ui/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.ejb.ui">
- <echo message="com.ibm.wtp.ejb.ui..."/>
- <ant antfile="../com.ibm.wtp.ejb.ui/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.emf.workbench.ui">
- <echo message="com.ibm.etools.emf.workbench.ui..."/>
- <ant antfile="../com.ibm.etools.emf.workbench.ui/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.j2ee.core">
- <echo message="com.ibm.etools.j2ee.core..."/>
- <ant antfile="../com.ibm.etools.j2ee.core/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.j2ee.reference.snippets">
- <echo message="com.ibm.etools.j2ee.reference.snippets..."/>
- <ant antfile="../com.ibm.etools.j2ee.reference.snippets/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.j2ee.ui">
- <echo message="com.ibm.etools.j2ee.ui..."/>
- <ant antfile="../com.ibm.etools.j2ee.ui/prepareforpii.xml" target="main"/>
-</target>
-
-
-<target name="com.ibm.etools.validation">
- <echo message="com.ibm.etools.validation..."/>
- <ant antfile="../com.ibm.etools.validation/prepareforpii.xml" target="main"/>
-
-</target>
-
-<target name="com.ibm.etools.validation.core">
- <echo message="com.ibm.etools.validation.core..."/>
- <ant antfile="../com.ibm.etools.validation.core/prepareforpii.xml" target="main"/>
-
-</target>
-
-<target name="com.ibm.etools.validation.ui">
- <echo message="com.ibm.etools.validation.ui..."/>
- <ant antfile="../com.ibm.etools.validation.ui/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.annotations.controller">
- <echo message="com.ibm.wtp.annotations.controller..."/>
- <ant antfile="../com.ibm.wtp.annotations.controller/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.annotations.core">
- <echo message="com.ibm.wtp.annotations.core..."/>
- <ant antfile="../com.ibm.wtp.annotations.core/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.annotations.ui">
- <echo message="com.ibm.wtp.annotations.ui..."/>
- <ant antfile="../com.ibm.wtp.annotations.ui/prepareforpii.xml" target="main"/>
-
-</target>
-
-<target name="com.ibm.wtp.common">
- <echo message="com.ibm.wtp.common..."/>
- <ant antfile="../com.ibm.wtp.common/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.common.navigator">
- <echo message="com.ibm.wtp.common.navigator..."/>
- <ant antfile="../com.ibm.wtp.common.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.common.ui">
- <echo message="com.ibm.wtp.common.ui..."/>
- <ant antfile="../com.ibm.wtp.common.ui/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.ejb">
- <echo message="com.ibm.wtp.ejb.."/>
- <ant antfile="../com.ibm.wtp.ejb/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.emf">
- <echo message="com.ibm.wtp.emf.."/>
- <ant antfile="../com.ibm.wtp.emf/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.emf.workbench">
- <echo message="com.ibm.wtp.emf.workbench.."/>
- <ant antfile="../com.ibm.wtp.emf.workbench/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.emf.workbench.edit">
- <echo message="com.ibm.wtp.emf.workbench.edit.."/>
- <ant antfile="../com.ibm.wtp.emf.workbench.edit/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.j2ee">
- <echo message="com.ibm.wtp.j2ee.."/>
- <ant antfile="../com.ibm.wtp.j2ee/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.j2ee.ui">
- <echo message="com.ibm.wtp.j2ee.ui.."/>
- <ant antfile="../com.ibm.wtp.j2ee.ui/prepareforpii.xml" target="main"/>
-</target>
-
-
-<target name="com.ibm.wtp.jca">
- <echo message="com.ibm.wtp.jca.."/>
- <ant antfile="../com.ibm.wtp.jca/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.web">
- <echo message="com.ibm.wtp.web.."/>
- <ant antfile="../com.ibm.wtp.web/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.webservice">
- <echo message="com.ibm.wtp.webservice.."/>
- <ant antfile="../com.ibm.wtp.webservice/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.project.interchange">
- <echo message="com.ibm.etools.project.interchange.."/>
- <ant antfile="../com.ibm.etools.project.interchange/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.ejb.samples">
- <echo message="com.ibm.etools.ejb.samples.."/>
- <ant antfile="../com.ibm.etools.ejb.samples/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.activities">
- <echo message="com.ibm.wtp.activities.."/>
- <ant antfile="../com.ibm.wtp.activities/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.j2ee.ui.navigator">
- <echo message="com.ibm.wtp.j2ee.ui.navigator.."/>
- <ant antfile="../com.ibm.wtp.j2ee.ui.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="org.eclipse.ui.views.navigator">
- <echo message="org.eclipse.ui.views.navigator.."/>
- <ant antfile="../org.eclipse.ui.views.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="org.eclipse.ui.workbench.navigator">
- <echo message="org.eclipse.ui.workbench.navigator.."/>
- <ant antfile="../org.eclipse.ui.workbench.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="All">
- <antcall target="com.ibm.etools.ejb.ui"/>
- <antcall target="com.ibm.wtp.ejb.ui"/>
- <antcall target="com.ibm.etools.emf.workbench.ui"/>
- <antcall target="com.ibm.etools.j2ee.core"/>
- <antcall target="com.ibm.etools.j2ee.reference.snippets"/>
- <antcall target="com.ibm.etools.j2ee.ui"/>
- <antcall target="com.ibm.etools.validation"/>
- <antcall target="com.ibm.etools.validation.ui"/>
- <antcall target="com.ibm.wtp.annotations.controller"/>
- <antcall target="com.ibm.wtp.annotations.core"/>
- <antcall target="com.ibm.wtp.annotations.ui"/>
- <antcall target="com.ibm.wtp.common"/>
- <antcall target="com.ibm.wtp.ejb"/>
- <antcall target="com.ibm.wtp.emf"/>
- <antcall target="com.ibm.wtp.emf.workbench"/>
- <antcall target="com.ibm.wtp.emf.workbench.edit"/>
- <antcall target="com.ibm.wtp.j2ee"/>
- <antcall target="com.ibm.wtp.j2ee.ui"/>
- <antcall target="com.ibm.wtp.jca"/>
- <antcall target="com.ibm.wtp.web"/>
- <antcall target="com.ibm.wtp.webservice"/>
- <antcall target="com.ibm.wtp.common.ui"/>
- <antcall target="com.ibm.wtp.common.navigator"/>
- <antcall target="com.ibm.etools.project.interchange"/>
- <antcall target="com.ibm.etools.ejb.samples"/>
- <antcall target="com.ibm.wtp.activities"/>
- <antcall target="com.ibm.etools.validation.core"/>
- <antcall target="com.ibm.wtp.j2ee.ui.navigator"/>
- <antcall target="org.eclipse.ui.views.navigator"/>
- <antcall target="org.eclipse.ui.workbench.navigator"/>
-</target>
-
-</project>
-
diff --git a/plugins/org.eclipse.jst.j2ee/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee/prepareforpii.xml
deleted file mode 100644
index 281f3d0..0000000
--- a/plugins/org.eclipse.jst.j2ee/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.j2ee"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/appclientarchiveops.properties b/plugins/org.eclipse.jst.j2ee/property_files/appclientarchiveops.properties
deleted file mode 100644
index bac1406..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/appclientarchiveops.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-#This properties file contains string for Archive operations of Application Clients.
-
-ARCHIVE_OPERATION_SaveFile=Error occurred saving the file..
-ARCHIVE_OPERATION_ProjectNature=Error getting project nature runtime..
-ARCHIVE_OPERATION_SaveManifest=Error occurred saving the manifest..
-ARCHIVE_OPERATION_FileNotFound=Error: File not found..
-ARCHIVE_OPERATION_OpeningArchive=Error opening archive for export..
-ARCHIVE_OPERATION_ImportOperation=Import Operation Failed!
-IMPORT_MOFRESOURCE_STRING=Importing meta-data..
-APPCLIENT_IMPORT_OPERATION_STRING=Importing application client JAR..
-APPCLIENT_IMPORT_FILE_STRING=Importing file..
-APPCLIENT_IMPORT_ERROR=Error importing application client file..
-ARCHIVE_OPERATION_ErrorOccured=Error occurred getting module folder name..
-Application_Client_File_UI_=Application Client File
-_c__Copyright_IBM_Corporation_2001_1=(c) Copyright IBM Corporation 2001
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/appclientcreation.properties b/plugins/org.eclipse.jst.j2ee/property_files/appclientcreation.properties
deleted file mode 100644
index f42d2b8..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/appclientcreation.properties
+++ /dev/null
@@ -1,14 +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
-###############################################################################
-Error_occured_getting_appl_ERROR_=IWAE0001E Error occurred getting application.xml:
-Creating_Application_Clien_UI_=Creating Application Client Project...
-Error_occured_loading_appl_UI_=Error occured loading application-client.xml:
-Not_an_Application_Client_project_ERROR_=IWAE0002E Not an Application Client project.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/applicationclientvalidation.properties b/plugins/org.eclipse.jst.j2ee/property_files/applicationclientvalidation.properties
deleted file mode 100644
index 7f5c89e..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/applicationclientvalidation.properties
+++ /dev/null
@@ -1,65 +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
-###############################################################################
-# This properties file holds all the externalized strings for the Application Client project
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/applicationclientvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-
-
-ERROR_APPLICATIONCLIENT_INVALID_APPCLIENT_FILE=CHKJ1000E: Validation failed because the application client file is not valid. Ensure that the deployment descriptor is valid.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: Validation failed:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: Unresolvable EJB references in {0};
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: The application client project has an invalid deployment descriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: The URI, {0}, does not match anything in the application client file.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: The deployment descriptor could not be loaded due to an unknown syntax error. The bad section starts at line {0}, column {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: The deployment descriptor could not be loaded due to an unknown syntax error. The bad section starts at line {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: The deployment descriptor could not be loaded due to an unknown syntax error. There is no information available to help identify the bad section.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: Validation cannot complete because the deployment descriptor cannot be opened.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E Duplicate resource environment reference "{0}" in application-client.xml.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E Document type version "{0}" for application-client.xml in project "{1}" needs to be version "{2}".
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E Duplicate enterprise bean reference "{0}" in application-client.xml.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E The Main-Class attribute must be defined in the application client module.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/applicationproviders.properties b/plugins/org.eclipse.jst.j2ee/property_files/applicationproviders.properties
deleted file mode 100644
index d426afd..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/applicationproviders.properties
+++ /dev/null
@@ -1,98 +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
-###############################################################################
-AllAuthenticatedUsers_UI_=AllAuthenticatedUsers
-AppName_UI_=AppName
-The_appName_property_UI_=The appName property
-Application_UI_=Application
-The_application_property_UI_=The application property
-AuthorizationTable_UI_=AuthorizationTable
-The_authorizationTable_property_UI_=The authorizationTable property
-RunAsMap_UI_=RunAsMap
-The_runAsMap_property_UI_=The runAsMap property
-ApplicationBinding_UI_=ApplicationBinding
-Failed_to_load_image_for_ERROR_=IWAE0001E Failed to load image for
-Create_Child_UI_=Create Child
-Create_a_new_child_for_the_selected_UI_=Create a new child for the selected
-Create_RoleAssignment_UI_=Create RoleAssignment
-Create_a_child_of_type_RoleAssignment_for_the_selected_UI_=Create a child of type RoleAssignment for the selected
-Everyone_UI_=Everyone
-Create_User_UI_=Create User
-Create_a_child_of_type_User_for_the_selected_UI_=Create a child of type User for the selected
-Role_UI_=Role
-The_role_property_UI_=The role property
-RoleAssignment_UI_=RoleAssignment
-Create_a_new_child_of_type_for_the_selected_UI_=Create a child for the selected
-AuthData_UI_=AuthData
-The_authData_property_UI_=The authData property
-SecurityRole_UI_=SecurityRole
-The_securityRole_property_UI_=The securityRole property
-RunAsBinding_UI_=RunAsBinding
-Create_RunAsBinding_UI_=Create RunAsBinding
-Create_a_child_of_type_RunAsBinding_for_the_selected_UI_=Create a child of type RunAsBinding for the selected
-SpecialSubject_UI_=SpecialSubject
-Name_UI_=Name
-The_name_property_UI_=The name property
-AccessId_UI_=AccessId
-The_accessId_property_UI_=The accessId property
-Subject_UI_=Subject
-Create_WebModuleExtension_UI_=Create WebModuleExtension
-Create_a_child_of_type_WebModuleExtension_for_the_selected_UI_=Create a child of type WebModuleExtension for the selected
-ReloadInterval_UI_=ReloadInterval
-The_reloadInterval_property_UI_=The reloadInterval property
-ApplicationExtension_UI_=ApplicationExtension
-EJB_Module_Extension_UI_=EJB Module Extension
-Client_Module_Extension_UI_=Client Module Extension
-AltBindings_UI_=AltBindings
-The_altBindings_property_UI_=The altBindings property
-AltExtensions_UI_=AltExtensions
-The_altExtensions_property_UI_=The altExtensions property
-DependentClasspath_UI_=DependentClasspath
-The_dependentClasspath_property_UI_=The dependentClasspath property
-AbsolutePath_UI_=AbsolutePath
-The_absolutePath_property_UI_=The absolutePath property
-ApplicationExtension_1_UI_=ApplicationExtension
-The_applicationExtension_property_UI_=The applicationExtension property
-Module_UI_=Module
-The_module_property_UI_=The module property
-<<Unresolvable_ERROR_=IWAE0002E <<Unresolvable
-Create_Module_UI_=Create Module
-Create_a_child_of_type_Module_for_the_selected_UI_=Create a child of type Module for the selected
-SmallIcon_UI_=SmallIcon
-The_smallIcon_property_UI_=The smallIcon property
-LargeIcon_UI_=LargeIcon
-The_largeIcon_property_UI_=The largeIcon property
-Description_UI_=Description
-The_description_property_UI_=The description property
-DisplayName_UI_=DisplayName
-The_displayName_property_UI_=The displayName property
-<<No_display_name>>_ERROR_=IWAE0003E <<No display name>>
-Uri_UI_=Uri
-The_uri_property_UI_=The URI property
-AltDD_UI_=AltDD
-The_altDD_property_UI_=The altDD property
-<<URI_not_set>>_ERROR_=IWAE0004E <<URI not set>>
-ContextRoot_UI_=ContextRoot
-The_contextRoot_property_UI_=The contextRoot property
-Create_a_child_for_the_selected_UI_=Create a child for the selected
-Module_Extension_UI_=Module Extension
-Web_Module_Extension_UI_=Web Module Extension
-EARProjectMap_UI_=EARProjectMap
-Project_Name_UI_=Project Name
-The_project_name_property_of_the_module_mapping_UI_=The project name property of the module mapping
-The_module_of_the_module_mapping_UI_=The module of the module mapping
-ModuleMapping_UI_=ModuleMapping
-Project_Name_1=Project Name
-The_project_name_property_of_the_utility_jar_mapping_UI_=The project name property of the utility JAR mapping
-The_uri_property_of_the_utility_jar_mapping_UI_=The uri property of the utility JAR mapping
-_UI_JavaClientModule_type=JavaClient
-_UI_EjbModule_type=EJB
-_UI_WebModule_type=Web
-_UI_ConnectorModule_type=Connector
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/basecodegen.properties b/plugins/org.eclipse.jst.j2ee/property_files/basecodegen.properties
deleted file mode 100644
index 80a2455..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/basecodegen.properties
+++ /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
-###############################################################################
-No_analysis_reason_provide_INFO_=IWAE0001I No analysis reason is provided for the result, from \"{0}\" to \"{1}\".
-_missing_=<missing>
-Analysis_status_out_of_ran_EXC_=IWAE0002E Analysis status out of range.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/commonedit.properties b/plugins/org.eclipse.jst.j2ee/property_files/commonedit.properties
deleted file mode 100644
index 92b14c0..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/commonedit.properties
+++ /dev/null
@@ -1,401 +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
-###############################################################################
-Create_Two_Children_UI_=Create Two Children
-Create_Child_UI_=Create Child
-Name_UI_=Name
-The_name_property_UI_=The name property
-Type_UI_=Type
-The_type_property_UI_=The type property
-Home_UI_=Home
-The_home_property_UI_=The home property
-Remote_UI_=Remote
-The_remote_property_UI_=The remote property
-_UI_EJBLocalRef_localHome_feature_desc=The local home property
-_UI_EJBLocalRef_local_feature_desc=The local property
-Link_UI_=Link
-The_link_property_UI_=The link property
-Description_UI_=Description
-The_description_property_UI_=The description property
-Client_UI_=Client
-The_client_property_UI_=The client property
-WebApp_UI_=WebApp
-The_webApp_property_UI_=The webApp property
-Ejb_UI_=Ejb
-The_ejb_property_UI_=The EJB property
-Value_UI_=Value
-The_value_property_UI_=The value property
-Auth_UI_=Auth
-The_auth_property_UI_=The auth property
-RoleName_UI_=RoleName
-The_roleName_property_UI_=The roleName property
-Application_UI_=Application
-The_application_property_UI_=The application property
-Servlet_UI_=Servlet
-The_servlet_property_UI_=The servlet property
-EJB_Reference_UI_=EJB Reference
-_UI_EJBLocalRef_type=EJB Local Reference
-New_UI_=Add
-Delete_UI_=Remove
-Delete_EJB_references_UI_=Delete EJB references
-Variable_UI_=Variable
-Delete_environment_entries_UI_=Delete environment entries
-(New_Variable)_UI_=(New Variable)
-New_environment_entry_UI_=New environment entry
-Delete_resource_references_UI_=Delete resource references
-Reference_Name_UI_=Reference Name
-Authentication_UI_=Authentication
-(New_ResourceRef)_UI_=(New ResourceRef)
-New_resource_reference_UI_=New resource reference
-Security_Roles_UI_=Security Roles
-(New_Security_Role)_UI_=(New Security Role)
-New_security_role_UI_=New security role
-Delete_security_roles_UI_=Delete security roles
-Bad_parent_ERROR_=IWAE0001E Bad parent
-Choose_Icons_UI_=Choose Icons
-Preview_UI_=Preview
-Browse..._UI_=Browse...
-Resource_must_exist._ERROR_=IWAE0002E Resource must exist.
-Resource_must_be_accessibl_ERROR_=IWAE0003E Resource must be accessible.
-What_resources_do_you_want_UI_=What resources do you want to export?
-Where_do_you_want_to_expor_UI_=Where do you want to export resources to?
-Options__UI_=Options:
-Export_source_files_UI_=Export source files
-Create_directory_structure_UI_=Create directory structure
-Create_directories_for_sel_UI_=Create directories for selected folders
-Import_into_new_or_existin_UI_=Import into new or existing Enterprise Application project
-Create_complete_container__UI_=Create complete folder structure
-File_Selection_UI_=File Selection
-Select_a_file__UI_=Select a file:
-Label_Ear_Project_Name_UI=Enterprise application project name:
-Label_Where_To_Import_UI_=Where do you want the imported resources to go?
-Overwrite_existing_resources_UI_=Overwrite existing resources without warning
-Overwrite_existing_resources_export_UI_=Overwrite existing files without warning
-(New_EJB_Ref)_UI_=(New EJB Ref)
-Small_(16x16)__UI_=Small (16x16):
-Large_(32x32)__UI_=Large (32x32):
-Choose_Small_Icon_UI_=Choose Small Icon
-Select_the_Small_Icon_UI_=Select the Small Icon
-Choose_Large_Icon_UI_=Choose Large Icon
-Select_the_Large_Icon_UI_=Select the Large
-Icon29concat=Create a new child for the selected {0}.
-1concat_UI_=Create a new child for the selected {0}.
-3concat_UI_=BasicAuthData {0}
-4concat_UI_=EjbRefBinding {0}
-## on the following line, do not translate: CHILD_CLASS_NAME ##
-5concat_UI_=Create a child of type #CHILD_CLASS_NAME# for the selected {0}.
-6concat_UI_=ResourceRefBinding {0}
-9concat_EXC_=IWAE0004E Failed to load image for ''{0}''
-11concat_ERROR_=IWAE0005E Cannot find the image for the file: {0}
-12concat_ERROR_=IWAE0006E Problems with URL format of the image file: {0}
-28concat_UI_={0} is an invalid character in a resource name.
-29concat_UI_=Enterprise Application project contains invalid character {0}.
-30concat_UI_=Enterprise Application must be absolute. Use /{0}.
-13concat_UI_={0} is an invalid character in a resource name.
-14concat_UI_=Enterprise Application project contains invalid character {0}.
-15concat_UI_=Enterprise Application must be absolute. Use /{0}.
-16concat_UI_=Create a child of type {0} for the selected {1}.
-18concat_UI_=Create {0}
-19concat_UI_=Create two new children for the selected {0}.
-20concat_UI_=Create two new children of type {0} for the selected {1}.
-21concat=Create Two {0}s
-Undo@Ctrl+Z_UI_=Undo@Ctrl+Z
-{0}_change_UI_={0} change
-Project_and_EAR_names_can__UI_=Destination Project and Enterprise Application names cannot be the same
-You_must_specify_an_EAR_pr_UI_=You must specify an Enterprise Application project that exists or should be created
-Invalid_EAR_project_name_UI_=Invalid Enterprise Application project name
-Project_exist,_but_it_is_n_UI_=Project exist, but it is not an Enterprise Application project
-EAR_Project_Name__UI_=Enterprise application project name:
-Create_Child_UI__UI_=Create Child
-UserId_UI_=UserId
-The_userId_property_UI_=The userId property
-Password_UI_=Password
-The_password_property_UI_=The password property
-JndiName_UI_=JndiName
-The_jndiName_property_UI_=The jndiName property
-## on the following line, do not translate: bindingEjbRef ##
-The_bindingEjbRef_property_UI_=The bindingEjbRef property
-## on the following line, do not translate: bindingResourceRef ##
-The_bindingResourceRef_pro_UI_=The bindingResourceRef property
-## do not translate the following line ##
-DefaultAuth_UI_=DefaultAuth
-## on the following line, do not translate: defaultAuth ##
-The_defaultAuth_property_UI_=The defaultAuth property
-## on the following line, do not translate: CHILD_CLASS_NAME ##
-Create_#CHILD_CLASS_NAME#_UI_=Create #CHILD_CLASS_NAME#
-Question_UI_=Question
-Resource__UI_=Resource {0} already exists. Would you like to overwrite it?
-New_EJB_reference_UI_=New EJB reference
-The_EJB_property_UI_=The EJB property
-An_error_occurred_reading__ERROR_=IWAE0007E An error occurred reading the meta-data in Enterprise Application project {0}:
-Error_in_EAR_project_UI_=Error in Enterprise Application project
-Manifest_Class-Path__UI_=Manifest Class-Path:
-Module_Dependencies_UI_=Module Dependencies
-Select_dependent_JARs_for__UI_=Select dependent JARs for the module within the Enterprise Application project.
-Project_name__UI_=Project name:
-NO_EAR_JARDEP_FOR_MOD_UI_=Selected module not associated with an Enterprise Application module.
-EAR_Project_Name__UI__UI_=Enterprise application project name:
-Project_UI_=Project
-Available_dependent_JARs__UI_=Available dependent JARs:
-Project_{0}_is_not_referen_ERROR_=IWAE0008E Project {0} is not referenced by any Enterprise Application project.
-Unable_to_edit_module_depe_UI_=Unable to edit module dependencies
-Define_Java_Build_Settings_UI_=Define Java Build Settings
-Specify_the_source_and_out_UI_=Specify the source and output folders, as well as the Java classpath in the appropriate order.
-Enter_a_valid_project_name_UI_=Enter a valid project name
-Project_name_has_invalid_c_UI_=Project name has invalid characters
-Project_does_not_exist_or__UI_=Project does not exist or Invalid project nature. Enter a valid project name
-EAR_Project_Name_UI_=Enterprise application project name:
-Invalid_destination_projec_UI_=Invalid destination project
-Cannot_import_into_a_close_UI_=Cannot import into a closed project
-Project_name_must_be_speci_UI_=Project name must be specified
-Select_an_EAR_Project_UI_=Select an Enterprise Application project
-The_project_is_referenced__ERROR_=IWAE0009E The project is referenced by more than one Enterprise Application project. Please select the primary Enterprise Application project.
-An_internal_error_occurred_ERROR_=IWAE0010E An internal error occurred:
-2concat_INFO_=IWAE0011I The file {0} is read-only and cannot be saved. Would you like to make it editable and save anyway?
-Information_UI_=Information
-The_chosen_operation_is_no_INFO_=IWAE0012I The chosen operation is not currently available.
-Save_problems_UI_=Save problems
-Save_could_not_be_complete_INFO_=IWAE0013I Save could not be completed. Some related files may have already been saved.\n\nReason
-Yes_UI_=Yes
-Yes_To_All_UI_=Yes To All
-No_UI_=No
-Saving_Read-Only_File_UI_=Saving Read-Only File
-A_source_folder_must_be_sp_UI_=A source folder must be specified
-EAR_project_is_not_open_UI_=Enterprise Application project is not open
-1concat_EXC_=IWAE0014E Invalid initial delay: {0}
-2concat_EXC_=IWAE0015E Invalid delay: {0}
-Information_UI__UI_=Information
-Error_UI_=Error
-Confirm_UI_=Confirm
-Can't_start_a_TimerQueue_t_EXC_=IWAE0016E Can't start a TimerQueue that is already running
-Module_Dependency_Dialog_Title_UI_=Module Dependencies Dialog
-JAR/Module_UI_=JAR/Module
-Must_be_an_Connector_Cli1_UI_=Must be a Connector project.
-Must_be_an_Application_Cli_UI_=Must be an Application Client, EJB, or Web project.
-Must_be_an_EJB_project._UI_=Must be an EJB project.
-Selection_must_be_a_Web_pr_UI_=Selection must be a Web project.
-Must_be_an_Enterprise_Appl_UI_=Must be an Enterprise Application project.
-Must_be_an_Application_Cli1_j2ee13_UI_=Must be an J2EE 1.3 Application Client project.
-Must_be_an_Application_Cli1_UI_=Must be an Application Client project.
-Select_the_highest_J2EE_version_that_is_to_be_used__UI_=&Highest J2EE version used for development:
-Unexpected_IO_exception_occurred_creating_xml_document_1_EXC_=IWAE0017E Unexpected IO exception occurred creating xml document
-Delete_1=Delete...
-Delete_selected_project(s)_2=Delete selected project(s)
-Remove_module(s)_from_all_Enterprise_Applications_3=Remove module(s) from all Enterprise Applications
-Remove_module(s)_from_all_other_Enterprise_Applications_4=Remove module(s) from all other Enterprise Applications
-Remove_module_dependencies_referencing_selected_project(s)_5=Remove module dependencies referencing selected project(s)
-Delete_Module_Options_6=Delete Module Options
-Delete_Enterprise_Application_Options_7=Delete Enterprise Application Options
-Delete_could_not_be_completed_8=Delete could not be completed
-Delete_error_9=Delete error
-What_would_you_like_to_delete__10=What would you like to delete?
-Delete_selected_Enterprise_Application_project(s)_only_11=Delete selected Enterprise Application project(s) only
-Also_delete_module_and_utility_Java_projects_12=Also delete module and utility Java projects
-Delete_selected_project(s)_only_13=Delete selected project(s) only
-Also_delete_references_to_selected_project(s)_14=Also delete references to selected project(s)
-Rename_1=Rename...
-Rename_selected_project_2=Rename selected project
-Rename_module_in_all_Enterprise_Applications_3=Rename module in all Enterprise Applications
-Rename_module_in_all_other_Enterprise_Applications_4=Rename module in all other Enterprise Applications
-Rename_module_dependencies_referencing_selected_project_5=Rename module dependencies referencing selected project
-Rename_Module_Options_6=Rename Module Options
-Rename_Enterprise_Application_Options_7=Rename Enterprise Application Options
-Rename_could_not_be_completed_8=Rename could not be completed
-Rename_error_9=Rename error
-What_would_you_like_to_rename_this_to__10=What would you like to rename this to?
-Context_Root__11=Context Root:
-Rename_selected_Enterprise_Application_project_only_12=Rename selected Enterprise Application project only
-Also_rename_module_and_utility_Java_projects_13=Also rename module and utility Java projects
-Source_1=Source
-Error_creating_nested_text_editor_2=Error creating nested text editor
-Redirecting_Editor_1=Redirecting Editor
-Problems_Opening_Editor_2_ERROR_=IWAE0018E Problems Opening Editor
-The_selected_input_is_not_valid_for_this_type_of_editor.__Redirecting_to_the_XML_editor_3_ERROR_=IWAE0019E The selected input is not valid for this type of editor. Redirecting to the XML editor.
-REDIRECT_TEXT_EDITOR_UI_=The selected input is not valid for this type of editor. Redirecting to the text editor.
-REDIRECT_TEXT_EDITOR_BINARY_PROJECT_UI_=The selected input is not valid for this type of editor. For binary projects, you can open the editor read-only from the deployment descriptor node in the Project Navigator or J2EE Hierarchy view. Redirecting to the text editor.
-Error_checking_out_files_10=Error checking out files
-Inconsistent_files_detected_11=Inconsistent files detected
-The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_=IWAE0020W The following files are inconsistent with the file system.\nDo you want to save and overwrite these files on the file system?
-Project_should_not_be_null_1_EXC_=IWAE0021E Project should not be null
-Non-project_in_selection_2_EXC_=IWAE0022E Non-project in selection
-Project_should_not_be_null_1_ERROR_=IWAE0023E Project should not be null
-Non-project_in_selection_2_ERROR_=IWAE0024E Non-project in selection
-Up_1=&Up
-Down_2=&Down
-Select_All_3=Select &All
-Deselect_All_4=D&eselect All
-Project_3=Project
-Enterprise_Application_Project_4=Enterprise application project:
-New_ejb_project_and__ear_project_cannot_have_the_same_non_default_location_5_UI_=New EJB project and EAR project cannot have the same non default location
-New_ejb_project_and__ear_project_cannot_have_the_same_non_default_location_6_UI_=New EJB project and EAR project cannot have the same non default location
-Project_already_exists,_enter_a_new_project_name_to_create_a_new_EJB_project_7_UI_=Project already exists, enter a new project name to create a new EJB project
-Project_already_exists,_enter_a_new_project_name_to_create_a_new_EAR_project_8_UI_=Project already exists, enter a new project name to create a new EAR project
-Jar_file_name_must_be_entered_9_UI_=JAR file name must be entered
-New_project_name__1=New project name:
-New_project_location__2=New project location:
-New_4=New
-Existing_5=Existing
-Existing_project_name__6=Existing project name:
-Select_Project_7=Select Project
-Project_does_not_exist_8=Project does not exist
-Not_a_project_9=Not a project
-Select_a_project_10=Select a project
-DefaultEAR_1=DefaultEAR
-Default13EAR_2=Default13EAR
-Enterprise_Application_Project_3=Enterprise application project:
-New_ejb_project_and_the_new_ear_project_cannot_have_the_same_non_default_location_4_ERROR_=IWAE0025E New EJB project and the new EAR project cannot have the same non default location
-New_project_location__1=New project location:
-MapInfoPath.applyPath()_-_Could_not_successfully_apply_path_1_EXC_=IWAE0026E MapInfoPath.applyPath() - Could not successfully apply path
-Enter_a_valid_name=Enter a valid {0} name
-The_non_default_location___1=The non default location: {0} for module {1} is in use.
-The_project_location_in_use_UI=The non default location: {0} for {1} is in use.
-Inconsistent_File_1=Inconsistent File
-Inconsistent_Files_3=Inconsistent Files
-The_following_workspace_files_are_inconsistent_with_the_editor_4=The following workspace files are inconsistent with the editor: \n
-Update_the_editor_with_the_workspace_contents__5=Update the editor with the workspace contents?
-The_following_workspace_file_is_inconsistent_with_the_editor_1=The following workspace file is inconsistent with the editor: {0} \n
-EAR_project_1=EAR project:
-EJB_project_2=EJB project
-EXPORT_SOURCE_ZIP_UI_=Also export a source ZIP file
-EAR_project_UI_=EAR project:
-Project_and_EAR_project_non_default_location_UI_=Project and EAR project cannot have the same non default location
-Invalid_non_default_location_UI_=Invalid non default location
-Project_Main_UI_=Project
-There_are_no_projects_available_that_match_the_selection_criteria._1=There are no projects available that match the selection criteria.
-Incompatible_EAR_and_Web_Project_Level_1=Incompatible EAR and Web Project Level
-You_have_selected_a_1.2_level_EAR.__Your_Web_Project_J2EE_level_will_be_changed_to_1.2.__Would_you_like_to_proceed_ERROR_2=IWAE0027E You have selected a 1.2 level EAR. Your Web Project's J2EE level will be changed to 1.2. Would you like to proceed?
-J2EE_Level_4=J2EE Level
-Project_1=Project
-J2EE_Level_2=J2EE Level
-Please_choose_a_J2EE_1.2_level_project_3=Please choose a J2EE 1.2 level project
-Please_choose_a_J2EE_1.3_level_project_4=Please choose a J2EE 1.3 level project
-Problems_Opening_Editor_2=Problems Opening Editor
-The_selected_input_is_not_valid_for_this_type_of_editor.__Redirecting_to_the_XML_editor._ERROR_=IWAE0028E The selected input is not valid for this type of editor. Redirecting to the XML editor.
-Enterprise_Application_Project__2=Enterprise application Project:
-Context_root__3=Context root:
-CANT_IMPORT_TO_BINARY_PROJECT_UI_=Cannot import into the existing project "{0}" because the project is binary.
-One_or_more_referenced_Web_Library_Projects_do_not_exist=One or more Web Library Projects referenced by {0} do not exist or are closed.\n\nDo you want to continue without exporting these Web Library Projects?
-Warning_1=Warning
-Project_Doc_Root=Context root:
-NO_EAR_JARDEP_UI_=Project is not associated with an Enterprise Application project.
-The_description_property_of_the_identity_2=The description property of the identity
-The_role_name_property_of_the_identity_4=The role name property of the identity
-The_identity_of_the_run_as_specified_identity_2=The identity of the run as specified identity
-The_description_property_of_the_security_identity_2=The description property of the security identity
-Binary_Project_1=Binary Project
-Include_project_build_paths_and_meta-data_files_1=Include project build paths and meta-data files
-new_EAR_project_1=new EAR project
-_ERROR_The_jar_file_does_not_exist_2=IWAE0029E The JAR file does not exist
-_ERROR_The_J2EE_level_of_the_Jar_file_does_not_match_the_Project_level_3=IWAE0030E The J2EE level of the JAR file does not match the Project level
-_ERROR_The_J2EE_level_of_the_jar_file_does_not_match_the_Enterprise_Application_level_4=IWAE0031E The J2EE level of the JAR file does not match the Enterprise Application level
-The_action_cannot_be_performed_on_the_selection,_which_is_part_of_a_binary_project_UI_=The action cannot be performed on the selection, which is part of a binary project.
-destination_project_1=destination project
-CUSTOM_DELETE_MIX_MATCH_UI_=The custom J2EE delete options are not available for the selected J2EE projects. The standard delete options will be used.
-PROJECT_NOT_ACCESSIBLE=The project {0} is not accessible.
-IMPORT_FAILED_UI_=Import Failed
-ERROR_READING_MANIFEST_DIALOG_TITLE=Error Reading Manifest
-SAVE_MANIFEST_WITH_ERROR=The manifest file contains errors and can not be parsed. The file will be saved but the Java build path will not be updated. Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR=The manifest file contains errors and can not be parsed. Other pages cannot be used until these errors are corrected. Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE=The manifest file contains errors and can not be parsed. Following are common limitations which can cause problems:
-MANIFEST_PROBLEM_1=* Lines in the file must be no greater than 72 bytes. Continuation of long lines is indicated by a new line and a space.
-MANIFEST_PROBLEM_2=* The last line in the file must end with a new line or it will not be parsed.
-MANIFEST_PROBLEM_3=* Blank lines with extra white space may cause parse to fail.
-MANIFEST_PROBLEM_4=* The attributes must be formatted correctly. Refer to the manifest and JAR file specification for more information.
-ERROR_OCCURRED_TITLE=Error
-ERROR_OCCURRED_MESSAGE=An internal error occurred performing the selected action.
-SAVE_ON_BINARY_PROJECT_TITLE_UI_=Binary Projects
-SAVE_ON_BINARY_PROJECT_MESSAGE_UI_=Cannot edit binary projects. All changes will be lost when you click OK. Are you sure you want to continue?
-The_JAR_file_does_not_exist=The JAR file does not exist.
-The_J2EE_level_of_the_Jar_file_does_not_match_the_Project_level._7=The J2EE level of the JAR file does not match the project level.
-Project_already_exists.=Project {0} already exists.
-Enterprise_Application_Project_does_not_exist.=Enterprise Application project {0} does not exist.
-Enterprise_Application_Project_name_must_be_specified.=Enterprise Application project name must be specified.
-An_Enterprise_Application_Project_with_the_name_already_exists_in_the_workspace.=Enterprise Application project {0} already exists.
-Context_Root_cannot_be_emp_UI_=Context Root cannot be empty
-Project_With_Same_Name_Exists_UI_=The project named \"{0}\" already exists.
-Use_default_label_1=Use default
-Must_be_an_J2EE13_EAR_Project_UI_=Must be an J2EE 1.3 level EAR Project
-Assembly_Application_Project_Suffix=EAR
-Assembly_EJBJAR_Project_Suffix=EJB
-Assembly_Web_Project_Suffix=Web
-Assembly_ClientJAR_Project_Suffix=Client
-Assembly_Connector_Project_Suffix=Connector
-Advanced..._UI=Advanced...
-Project_Location_UI_=Project location:
-DD_GENERAL_NAME=Deployment Descriptor
-Destination__1=Destination:
-Resource__2=Resource:
-The_file_does_not_exist._1=The file does not exist.
-Resource__2=Resource:
-Must_be_an_J2EE12_Module_Only_UI_=Must be a J2EE 1.2 Level module file only.
-Project_location__1=Project location:
-Project__1=Project:
-Browse..._2=Browse...
-New..._3=New...
-Invalid_EAR_For_Selected_Module=The J2EE level of the Enterprise Application project is not valid for the selected module file
-Invalid_Project_For_Selected_Module=The J2EE level of the destination project is not valid for the selected module file
-Invalid_EAR_Name_For_Project_Creation=The J2EE level of the exisiting EAR project: {0} does not match the J2EE level of the project being creation
-J2EEImportWizardPage1.EAR_project=EAR project:
-J2EEImportWizardPage1.The_file_does_not_exist=The file does not exist.
-NewJ2EEProjectCreationPage.Project_name=Project name:
-NewJ2EEProjectCreationPage.Project_location=Project location:
-NewJ2EEProjectCreationPage.EAR_project=EAR project:
-Proj_EAR_Proj_Name_Cannot_Be_Same_UI_=Project and EAR project names cannot be same
-Enable_Label_UI_=Enable server targeting support
-Disable_Label_UI_=Disable server targeting support
-Change_Module_Server_Target_Dialog_Message_UI_=EAR target server: "{0}" \nModule target server: "{1}"\n\nChange module target server to EAR target server?
-Change_EAR_Server_Target_Dialog_Message_UI_=Selected module target server: "{0}"\nExisting EAR target server: "{1}" \n\nChange EAR target server to selected module target server?
-CREATE_EJB_CLIENT_JAR_UI_=Create EJB client JAR projects for new EJB projects
-Change_Server_Target_Dialog_Title_UI_=Change Target Server
-Modify_Server_Target_Title_UI_=Modify Target Server
-Server_Target_UI_=Target server:
-Server_Target_Desc_UI_=Select a target server for the \"{0}\" project.
-Server_Target_Checkbox_Label_UI_=Update EAR modules and utility projects to the selected target server
-Server_Target_Change_Desc_UI_=The target server "{0}" of the existing EAR project "{1}" is incompatible \nwith the module project being created. \n\nDo you want to change the target server of the EAR project to the module target server:\n\n{2} ?
-EJB_CLIENT_RADIO_UI_=References to EJB JARs with EJB Client JARs
-USE_EJB_SERVER_JARs_UI_=Use EJB JARs
-USE_EJB_CLIENT_JARs_UI_=Use EJB client JARs
-USE_BOTH_UI_=Allow both
-EJB_CLIENT_JARS_UI_=EJB Client JARs
-JAR_DEPS_CLIENT_UI_=Java JAR Dependencies for references to EJB JARs:
-USE_EJB_JAR_UI=Use EJB JAR
-USE_EJB_JAR_DESC_UI=All referencing modules and JARs depend on the EJB JAR. This is compatible with WebSphere 4.x, 5.x, and most application servers.
-USE_EJB_CLIENT_JAR_UI_=Use EJB Client JAR, if it exists
-USE_EJB_CLIENT_JAR_DESC_UI=All referencing modules and JARs depend on the EJB client JAR. This is best practice, but is only compatibile with WebSphere 5.1 and any application servers that support EJB client JAR deployment.
-NONE_SERVER_TARGET_STRING_UI_=No target server specified
-Server_Invalid_For_Exisitng_EAR_UI_=Selected target server "{0}" is invalid for the existing EAR project "{1}"
-Cannot_Set_Server_Target_UI_=Could not set server target\n\n
-_UI_EJBLocalRef_localHome_feature=Local Home
-_UI_EJBLocalRef_local_feature=Local
-_UI_EJBLocalRef_type=Local Ref
-_UI_QName_type=QName:
-_UI_CompatibilityDescriptionGroup_description_feature=Description
-_UI_CompatibilityDescriptionGroup_description_feature_desc=
-_UI_CompatibilityDescriptionGroup_displayName_feature=Display name
-_UI_CompatibilityDescriptionGroup_displayName_feature_desc=
-_UI_CompatibilityDescriptionGroup_smallIcon_feature=Small icon
-_UI_CompatibilityDescriptionGroup_smallIcon_feature_desc=
-_UI_CompatibilityDescriptionGroup_largeIcon_feature=Large icon
-_UI_CompatibilityDescriptionGroup_largeIcon_feature_desc=
-MessageDestination_UI_=Message Destination
-MessageDestinationRefItemProvider_UI_0=MessageDestRef
-INCREMENTAL_DEPLOYMENT_LABEL=Perform Incremental Deployment
-GROUP_DEPLOYMENT_LABEL=Deployment
-
-_UI_QName_localPart_feature=Local Part
-_UI_QName_localPart_feature_desc=The QName local part.
-_UI_QName_namespaceURI_feature=Namespace URI
-_UI_QName_namespaceURI_feature_desc=The QName namespace URI
-Usage_UI_=Usage
-The_usage_property_UI_=The usage property
-_UI_ParamValue_description_feature=Description
-_UI_ParamValue_name_feature=Name
-_UI_ParamValue_value_feature=Value
-
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/eararchiveops.properties b/plugins/org.eclipse.jst.j2ee/property_files/eararchiveops.properties
deleted file mode 100644
index 975e160..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/eararchiveops.properties
+++ /dev/null
@@ -1,35 +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
-###############################################################################
-#This properties file contains string for Archive operations of EARs
-
-
-ARCHIVE_OPERATION_SaveMofResources=Error occurred saving the metadata file.
-ARCHIVE_OPERATION_SaveFile=Error occurred saving the file.
-ARCHIVE_OPERATION_ProjectNature=Error getting project nature runtime.
-ARCHIVE_OPERATION_SaveManifest=Error occurred saving the manifest.
-ARCHIVE_OPERATION_FileNotFound=Error: File not found.
-ARCHIVE_OPERATION_FileContents=Core exception caught in getting file contents.
-ARCHIVE_OPERATION_ErroOccured=Error occurred.
-ARCHIVE_OPERATION_FilesFromProject=Unable to get files, modules, or utility JARs in the EAR. Check log files.
-ARCHIVE_OPERATION_OpeningArchive=Error opening archive for export.
-ARCHIVE_OPERATION_ImportOperation=Import Operation Failed!
-IMPORT_MOFRESOURCE_STRING=Importing metadata..
-EAR_IMPORT_FILE_STRING=Importing file..
-ERROR_IMPORTING_EAR_FILE=Error importing EAR file.
-ERROR_EXPORTING_EAR_FILE=Error exporting EAR file.
-IMPORTING_EAR_FILE_UI_=Importing EAR file...
-
-Updating_project_classpath_UI_=Updating project classpaths...
-
-UNABLE_TO_LOAD_MODULE_ERROR_=IWAE0001E The module \" {0} \" in Enterprise Application project \" {1} \" could not be loaded.\n {2};
-_jar_UI_=.jar
-Updating_manifest_Class_Path__attributes_UI_=Updating manifest Class-Path: attributes
-_preDeploy_ERROR_=IWAE0002E {0}.preDeploy
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/earcreation.properties b/plugins/org.eclipse.jst.j2ee/property_files/earcreation.properties
deleted file mode 100644
index d51443b..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/earcreation.properties
+++ /dev/null
@@ -1,66 +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
-###############################################################################
-Error_occured_getting_appl_ERROR_=IWAE0001E Error occurred getting appliction.xml:
-Error_occured_getting_appl1_ERROR_=IWAE0002E Error occurred getting application.xml:
-Creating__UI_=Creating:
-Creating_EAR_Project_UI_=Creating Enterprise Application project...
-The_project_already_exist_ERROR_=IWAE0003E The project already exist.
-EARProjectCreationOperatio_ERROR_=IWAE0004E EARProjectCreationOperation.getNewProject :
-ABS_PATH_CHANGED_UI_=The IBM extensions file contains deprecated absolute paths. This can be auto-corrected and should be saved. This will remove the paths from the file, and only needs to be done once. Would you like to auto-correct?
-UNSAVED_CHANGES_WARN_=IWAE0005W Unsaved changes exist in Application. Project: {0}
-PROJECT_MAP_PROBLEMS_ERROR_=IWAE0006E Problems exist in project mappings for one or more modules in Application. Use Application editor to correct. Project: {0}
-MODULE_PROJECTS_CLOSED_WARN_=IWAE0007W One or more module projects is closed. Enterprise Application project: {0}.
-Add_Module_Command_Label_UI_=Add Module
-Remove_Module_Command_Label_UI_=Remove Module
-
-Set_project_UI_=Set project
-Add_Utility_JAR_UI=Add Utility JAR
-REM_UTIL_JAR_UI=Remove Utility JAR
-PROJ_DESC_UPDATE_ERROR_UI_=IWAE0008E The project description could not be updated.
-Not_an_ear_project_UI_=Not an EAR project.
-EAR_PROJECT_MUST_BE_OPEN_UI_=An EAR project must be open and must exist for properties to be edited.
-Updating_absolute_paths_UI_=Updating absolute paths for the server runtime.
-DuplicateModuleNames=Duplicate module names : {0}
-NoModulesSelected=No module types selected.
-
-
-KEY_1=Project must be of type Web, EJB, Application client or Connector
-KEY_2=Module already exists.
-KEY_3=Selected project is closed.
-KEY_4=Select a project from the list.
-KEY_5=URI exists.
-KEY_6=Selected project is not a Java project.
-KEY_7=The uri must end with '.jar'.
-KEY_8=Utility JAR already exists.
-KEY_9=An open EAR project is required.
-KEY_10=URI cannot be empty.
-KEY_11=The module "{0}" is not an Application Client module.
-KEY_12=The module "{0}" is not an EAR module.
-KEY_13=The module "{0}" is not an EJB module.
-KEY_14=The module "{0}" is not a RAR module.
-KEY_15=The module "{0}" is not a WAR module.
-KEY_16=The selected server target is not valid for the specified EAR component. The selected server may not support EAR component.
-J2EEUtilityJarListImportOperation_UI_0=Import Utility Jars
-J2EEUtilityJarListImportOperation_UI_1=Importing
-J2EEUtilityJarListImportOperation_UI_2=Problem importing Utility Jar
-J2EEUtilityJarListImportDataModel_0=Invalid path location.
-J2EEUtilityJarListImportDataModel_Specify_Valid_Project=Please specify a valid Enterprise Application Project.
-J2EEUtilityJarListImportDataModel_Select_Jar=Please select one or more Utility Jars.
-J2EEUtilityJarListImportDataModel_Specify_Linked_Path=Please specify a non-empty value for the Linked Path Variable name.
-EARImportDataModel_UI_0=Specified project name \" {0} \" for archive \" {1} \" already exists. Either choose a different name or allow project overwrites.
-EARImportDataModel_UI_1=Colliding project name \" {0} \" between EAR project name and \" {1} \" archive.
-EARImportDataModel_UI_2=Colliding project name \" {0} \" between archives \" {1} \" and \" {2} \".
-EARImportDataModel_UI_3=The specified project \" {0} \" already exists. Either choose a different project name or allow resource overwrites.
-ModuleMappingImpl_UI_0=projectName: {0}
-UtilityJARMappingImpl_UI_0=projectName: {0}, uri: {1}
-importWrongType=The specified project \" {0} \" is not the correct J2EE type.
-importWrongVersion=The specified project \" {0} \" is not J2EE version compatible with the specified archive.
-EAR_PROJECTNAME_SAMEAS_MODULE=The EAR Project name cannot be same as the Project Name.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/earvalidation.properties b/plugins/org.eclipse.jst.j2ee/property_files/earvalidation.properties
deleted file mode 100644
index 29fc0f9..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/earvalidation.properties
+++ /dev/null
@@ -1,140 +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
-###############################################################################
-# This properties file hold all the externalised strings for eTools
-# EAR Validation project
-#
-# Messages should be according to the format at
-# http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-# MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-# CHKW (IBM WebSphere Validation)
-#
-# Message numbers are four digit numbers, from '0000' to '9999', inclusive.
-# Message numbers are filled to the left with '0', to a width of 4.
-#
-# Valid message type codes are:
-# I (Informational)
-# W (Warning)
-# E (Error)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/earvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-# 29-June-2001:
-# This file has been tested using the ProcessMsgFile tool, written by
-# Hany Salem and owned by Dennis Hebert. Any future changes should
-# also be verified using this tool. Please contact Dennis
-# (hebert@us.ibm.com or T/L 543-2520) for more information.
-#
-# --------------------------------
-#NOTAMSG
-validator.name=EAR Validator
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: EAR Validation failed: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: The EAR project {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Duplicate security role named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: A module has been defined with no URI.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: The URI, {0}, does not match anything in the EAR file.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: The deployment descriptor could not be loaded. The start of the bad section is at line {0}, column {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: The deployment descriptor could not be loaded. The start of the bad section is at line {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: The deployment descriptor could not be loaded.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: Cannot open the deployment descriptor. Validation cannot complete.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E The URI {0} contains a space. This is not recommended because it cannot be referenced from a manifest file.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E The module {0} has duplicate uri in EAR: {1}.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E Same context root "{0}" exists in Web modules "{1}" and "{2}".
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E The module {0} has empty <alt-dd> tag in EAR {1}. The tag should be removed or the value should be valid.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =The project {0} in Enterprise Application project {1} has duplicate utility JAR URI {2}.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E The project {0} in Enterprise Application project {1} has duplicate module name {2}.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E The module {0} in Enterprise Application project {1} has same name as utility JAR URI.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E The module {0} in Enterprise Application project {1} has same name as utility JAR project name.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E An error occurred validating the MANIFEST.MF file in archive {0}.
-MANIFEST_LINE_END_ERROR_=IWAE0015E The MANIFEST.MF file in archive {0} does not end with a newline.
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E Line {0} in the MANIFEST.MF file in archive {1} exceeds the specification limit of 72 bytes.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E The module {0} has a wrong default extension (.jar for EJB modules and .war for Web modules).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E Document type version "{0}" for application.xml in project "{1}" needs to be version "{2}".
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E The deployment descriptor of module {0} could not be loaded. The bad section starts at line {1}, column {2}.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E The deployment descriptor of module {0} could not be loaded. The bad section starts at line {1}
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E The deployment descriptor of module {0} could not be loaded.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E The interfaces of the linked enterprise bean {0} do not match those in EJB ref {1} in module {2}.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: Meta folder {0} must exist in project {1}.
-WARNING_FILE_MISSING=IWAJ0001W: {0} must exist in project {1}.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W The module {0} has alt-dd {1}, but the resource does not exist in EAR {2}.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W The Manifest Class-Path in archive {0} contains an entry that cannot be resolved in the EAR: {1}.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W The Manifest Class-Path for archive {0} contains an entry, {1}, that is not resolveable to a file or module in the EAR: {2}.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W The Manifest Class-Path in module {0} contains an entry, {1}, that resolves to archive {2}. This dependency does not comply with the J2EE specification.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W EAR Validation cannot run on closed project: {0}. Open the project, and try again.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W The project {0} for module or utility JAR {1} in enterprise application project {2} does not exist in the workspace.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W The web module {0} in enterprise application project {1} is not a J2EE Web project.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W The IBM extensions file in enterprise application project {0} contains deprecated absolute paths. Use the application editor to clean up the file.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W The context root for Web module: {0} in enterprise application project: {1} does not match the context root in web project settings of {2}.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W The application client module {0} in enterprise application project:{1} is not an application client project.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W The EJB module {0} in enterprise application project {1} is not an EJB project.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W The module {0} in enterprise application project {1} is not mapped to a workbench project. Use the application editor to correct.
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E The case of the manifest file name "{0}" in archive {1} in incorrect. File name must be "META-INF/MANIFEST.MF", case sensitive.
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W Project utility JAR URI {0} collides with an existing file in project {1}.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E The application extension in EAR project: {0} is missing module extension for module project: {1}.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=The target server of the module project "{0}" does not match the target server of the containing enterprise application project "{1}"
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=The module project "{0}" with no target server belongs to an enterprise application project "{1}" that has a target server
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=The ear project "{0}" with no target server has module project "{1}" that has a target server
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=The J2EE 1.4 specification EAR project "{0}" has an incompatible target server "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=The J2EE 1.4 specification module project "{0}" has an incompatible target server "{1}".
-MESSAGE_INCOMPATIBLE_13_SPEC_WARNING_=IWAE0008E The module "{0}" is J2EE v1.3 specification level, which is incompatible in the v1.2 EAR.
-MESSAGE_INCOMPATIBLE_14_SPEC_WARNING_=The module "{0}" is J2EE v1.4 specification level, which is incompatible in the v1.3 EAR.
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0036E An internal error has occurred running validation on project:{0}, check the log file for details
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/ejbarchiveops.properties b/plugins/org.eclipse.jst.j2ee/property_files/ejbarchiveops.properties
deleted file mode 100644
index 9bb668d..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/ejbarchiveops.properties
+++ /dev/null
@@ -1,38 +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
-###############################################################################
-#This properties file contains string for Archive operations of EARs,EJBs and Application Clients.
-
-ARCHIVE_OPERATION_SaveMofResources=Error occured saving the metadata file.
-ARCHIVE_OPERATION_SaveFile=Error occured saving the File..
-ARCHIVE_OPERATION_ProjectNature=Error getting project nature runtime..
-ARCHIVE_OPERATION_SaveManifest=Error occured saving the manifest..
-ARCHIVE_OPERATION_FileNotFound=Error: File not found
-ARCHIVE_OPERATION_FileContents=Core exception caught in gettting file contents..
-ARCHIVE_OPERATION_ErroOccured=Error occured...
-ARCHIVE_OPERATION_FilesFromProject=Unable to get files from the project..
-ARCHIVE_OPERATION_OpeningArchive=Error opening archive for export..
-ARCHIVE_OPERATION_InvalidEJBJar=The JAR file is not a valid EJB JAR
-ARCHIVE_OPERATION_InvalidImportEJBJar=The import file is not a valid EJB JAR
-ARCHIVE_OPERATION_ImportOperation=Import Operation Failed!
-EJB_IMPORT_OPERATION_STRING=Importing EJB JAR..
-EJB_IMPORT_FILE_STRING=Importing file..
-IMPORT_MOFRESOURCE_STRING=Importing meta-data..
-IMPORT_OPERATION_STRING=Importing JAR..
-ERROR_COPYING_FILES_FROM_ORIGINAL_JAR=An error occurred copying files from the original EJB JAR file
-ERROR_IMPORTING_MODULE_FILE=Error importing Module File
-Yes_UI=Yes
-No_UI=No
-Yes_To_All_UI=Yes to All
-Cancel_UI_=Cancel
-Error_exporting__UI_=Error exporting
-EJB_Jar_File_UI_=EJB JAR File
-Copy_Dep_JARS_UI=Copy Dependent JARs
-
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/erefvalidation.properties b/plugins/org.eclipse.jst.j2ee/property_files/erefvalidation.properties
deleted file mode 100644
index 370fa9f..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/erefvalidation.properties
+++ /dev/null
@@ -1,70 +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
-###############################################################################
-#This properties file hold all the externalised strings for eTools J2EE Validation project
-# Validation project
-#
-# Messages should be according to the format at:
-# http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-# MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-# CHKJ (IBM WebSphere Validation)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/erefvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-# 14-October-2001:
-#
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFNAME=CHKJ3009E: In module {1}, ''ejb-ref-name'' element in ejb-ref: {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: In module {1}, ''ejb-ref-type'' element in ejb-ref: {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: In module {1}, ''ejb-ref-type'' element in ejb-ref: {0} is missing.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: In module {1}, Home interface is missing from ejb-ref: {0} element.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: In module {1}, Remote interface is missing from ejb-ref: {0} element.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' element {0} defines the ''role-link'' element but no ''security-role'' elements in the application descriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: Duplicate ''resource-ref'' element named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W EJB link element {0} is unresolvable in module {1} and EAR {2}.
-
-
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/j2ee_common.properties b/plugins/org.eclipse.jst.j2ee/property_files/j2ee_common.properties
deleted file mode 100644
index b3ea55f..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/j2ee_common.properties
+++ /dev/null
@@ -1,39 +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
-###############################################################################
-ERR_SECURITY_ROLE_EMPTY=The role name cannot be empty.
-ERR_SECURITY_ROLE_EXIST=The secutiry role named "{0}" already exists.
-ERR_JAVA_CLASS_NAME_EMPTY=The class name cannot be empty.
-ERR_JAVA_CLASS_NAME_EXIST=The class already exists in the package.
-ERR_JAVA_CLASS_FILE_NAME_EXIST=File with same name but different case exists.
-ERR_JAVA_CLASS_FOLDER_NAME_EMPTY=The source folder cannot be empty.
-ERR_JAVA_CLASS_FOLDER_PROJECT_NOT_OPEN=The project is not open.
-ERR_JAVA_CLASS_NOT_JAVA_PROJECT=Not a Java project.
-ERR_JAVA_CLASS_FOLDER_STATIC_PROJECT=Cannot be a static web project.
-ERR_JAVA_CLASS_FOLDER_NOT_SOURCE=Not a Java source folder.
-ERR_JAVA_CLASS_NAME_QUALIFIED=Do not use qualified class name.
-ERR_JAVA_CLASS_NAME_INVALID=Invalid Java class name:
-ERR_JAVA_CLASS_NAME_WARNING=Warning:
-ERR_JAVA_CLASS_SUPERCLASS_NOT_EXIST=The super class does not exist.
-ERR_JAVA_CLASS_SUPERCLASS_FINAL=The super class cannot be a final class.
-ERR_JAVA_PACAKGE_NAME_INVALID=Invalid Java package name:
-ERR_JAVA_PACKAGE_NAME_WARNING=Warning:
-ERR_BOTH_FINAL_AND_ABSTRACT=Class cannot be both final and abstract.
-WebServiceClientGenerator_UI_0=Generic J2EE Container
-ERR_SECURITY_ROLE_LIST_EMPTY=The list of security roles to be removed cannot be empty.
-
-ERR_JAVA_CLASS_FOLDER_NOT_EXIST=The source folder does not exist.
-
-ERR_EMPTY_MODULE_NAME=Module name cannot be empty.
-ERR_EMPTY_PROJECT_NAME=Project cannot be empty.
-ERR_PROJECT_NAME_EXISTS=Project name already exists.
-ERR_VERSION_NOT_SUPPORTED=This version is not supported by the server.
-ERR_NOT_SUPPORTED=Not supported by the server.
-ERR_JAVA_CLASS_FOLDER_NOT_ABSOLUTE=Source folder path must be a project relative absolute path.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/j2eecreation.properties b/plugins/org.eclipse.jst.j2ee/property_files/j2eecreation.properties
deleted file mode 100644
index 061eadb..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/j2eecreation.properties
+++ /dev/null
@@ -1,142 +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
-###############################################################################
-Creating__UI_=Creating:
-Error_creating_an_EAR_proj_UI_=Error creating an Enterprise Application project.
-JdkJarFileDoesNotExist_UI=The file {0} does not exist.
-APP_PROJECT_ERROR_EXC_=IWAE0001E An error occurred accessing the Enterprise Application project.
-UNKNOWN_UI_=??
-Creating_Java_Project_UI_=Creating Java Project
-Errors_occurred_deleting_module_dependencies_UI_=Errors occurred deleting module dependencies.
-Can_not_remove_module_dependency_from_project_UI_=Can not remove module dependency from project {0} because the project is binary.
-Errors_occurred_renaming_module_dependencies_UI_=Errors occurred renaming module dependencies.
-Can_not_rename_module_dependency_from_project_UI_=Can not rename module dependency from project {0} because the project is binary.
-
-J2EE_PROJECT_MIGRATION_TITLE_UI_=J2EE Project Migration
-ENTERPRISE_APPLICATIONS_UI_=Enterprise Applications
-WIZ_BAN_DESC_UI_=Select the {0} projects to be migrated. If needed, the project structures will be migrated.
-ENTERPRISE_APP_PROJECTS_UI_=Enterprise application projects:
-MIGRATE_J2EE_SPEC_UI_=Migrate project from version level J2EE 1.2 to J2EE 1.3
-MIGRATE_EJB_SPEC_UI_=Migrate project from version level EJB 1.1 to EJB 2.0
-MIGRATE_MODULE_PROJECTS_UI_=Migrate module projects
-APPLICATION_CLIENTS_UI_=Application Clients
-APPLICATION_CLIENT_PROJECTS_UI_=Application client projects:
-ENTERPRISE_BEANS_BAN_UI_=Enterprise Beans
-EJB_PROJECTS_UI_=EJB projects:
-ADD_LOCAL_CLIENT_VIEWS_CHECK_UI_=Add local client views
-MIGRATE_CMP_BEANS_UI_=Migrate CMP 1.1 beans to CMP 2.0 beans
-ADD_LOCAL_CLIENT_VIEWS_BAN_UI_=Add Local Client Views
-SELECT_EJB_CLIENT_VIEWS_UI_=Select the enterprise beans that will have local client views added.
-ENTERPRISE_BEANS_LIST_UI_=Enterprise beans:
-DELETE_REM_CLIENT_VIEWS_UI_=Delete remote client views
-LOCAL_CLIENT_VIEW_SCHEME_UI_=Local client view naming scheme:
-REUSE_DELETED_CLIENT_VIEW_NAME_UI_=Reuse the deleted remote client view name
-SPECIFY_SUFFIX_UI_=Specify suffix:
-SUFFIX_EXAMPLE_UI_=(For example, enterprise bean \'foo\' will have local client views named: \'fooLocal\' and \'fooLocalHome\'.)
-MIGRATION_SUCCESS_REPORT_UI_=Migration finished successfully.
-MIGRATION_WARNINGS_REPORT_UI_=Migration finished with warnings; see log files for details.
-MIGRATION_ERRORS_REPORT_UI_=Migration finished with errors; see log files for details.
-PROJECT_STRUCTURE_SUCCESS_UI_=Project structure migration successful: {0}.
-PROJECT_STRUCTURE_FAILED_UI_=Project structure migration failed: {0}.
-PROJECT_NOT_NEED_MIGRATION_UI_=Project structure did not need migration: {0}.
-J2EE_VERSION_SUCCESS_UI_=J2EE version level migration successful: {0}.
-J2EE_VERSION_FAILED_UI_=J2EE version level migration failed: {0}.
-J2EE_VERSION_NOT_NEED_MIGRATION_UI_=J2EE version level did not need migration: {0}.
-LOCAL_CLIENT_ADD_SUCCESS_UI_=Local client views added successfully: {0}.
-LOCAL_CLIENT_ADD_FAILED_UI_=Local client views failed on add: {0}.
-LOCAL_CLIENT_VIEWS_EXIST_UI_=Local client views already exist: {0}.
-REMOTE_CLIENT_DELETE_SUCCESS_UI_=Remote client views deleted successfully: {0}.
-REMOTE_CLIENT_DELETE_FAILED_UI_=Remote client views failed on delete: {0}.
-REMOTE_CLIENT_VIEWS_NOT_EXIST_UI_=Remote client views did not exist: {0}.
-JAR_11_IMPORT_20_UI_=The 1.1 JAR is being imported into an EJB 2.0 module. The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-CMP_11_IMPORT_20_UI_=The following CMP 1.1 beans are being imported into an EJB 2.0 module. The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-OLD_PROJECT_STRUCTURE_UI_=The J2EE project {0} has an old project structure, and should be migrated.
-PROJECT_MUST_BE_SELECTED_UI_=A {0} project must be selected.
-ENTERPRISE_APPLICATION_UI_=enterprise application
-APPLICATION_CLIENT_UI_=application client
-EJB_UI_=EJB
-WEB_UI_=WEB
-EJB_MUST_BE_SELECTED_UI_=An enterprise bean must be selected.
-MIGRATE_UI_=Migrate...
-MIGRATE_J2EE_PROJECTS_UI_=Migrate J2EE Projects...
-OPEN_J2EE_MIGRATION_WIZARD_UI_=Open J2EE Migration Wizard...
-MIGRATING_PROJECT_STRUCTURES_UI_=Migrating project structure...
-MIGRATING_J2EE_VERSION_UI_=Migrating project J2EE version level...
-ADDING_LOCAL_CLIENT_VIEWS_UI_=Adding local client views...
-DELETING_REMOTE_CLIENT_VIEWS_UI_=Deleting remote client views...
-MIGRATION_NOT_NEEDED_REPORT=Migration was not needed for the selected items.
-MIGRATION_NOT_POSSIBLE_REPORT=Migration was not possible for the selected items.
-SOURCE_FOLDER_RENAME_FAILED=Unable to rename the Java source folder {0}.
-SOURCE_FOLDER_RENAME_SKIPPED=The Java source folders are not renamed when there is more than one source folder.
-WEBCONTENT_FOLDER_RENAME_FAILED=Unable to rename the web content folder {0}.
-WEBCONTENT_FOLDER_RENAME_SKIPPED=The web content folder {0} not renamed.
-WEBPROJECT_VERSION_MIGRATE_FAILED=Unable to migrate the web project version.
-ABS_PATHS_APP_EXT_REMOVED=Absolute paths were removed from the application extensions file in enterprise application project {0}.
-PROJECT_REFERENCES_UPDATED=Project references were updated in enterprise application project {0}.
-PROJECT_CLASSPATH_UPDATED=Project Java build path was updated for project {0}.
-FAILED_MIGRATING_IMPORTED_CLASSES=Unable to migrate the imported_classes JAR file. Exception: {0}
-EXTRACTED_IMPORTED_CLASSES=Imported classes were extracted from file {0}.
-IMPORTED_CLASSES_FILE_DELETED=Imported classes file {0} was deleted.
-BACKEND_MIGRATION_FAILED=Unable to migrate the Map and Schema file structure in project {0}
-BINARY_MIGRATION_FAILED=Unable to migrate binary project {0}.
-COMPLETED_BACKEND_MIG=The backend (Map and Schema) meta-data of the {0} project migrated successfully.
-NOT_NEEDED_DEPLOYMENT_DESC_MIG=The deployment descriptor was not found in the project {0}.
-NOT_NEEDED_BACKEND_MIG=The old backend (Map and Schema) structure was not found in the project {0}.
-MIGRATION_COMPLETE=Migration Complete
-MIGRATION_ERRORS=Migration Errors
-MIGRATION_NOT_NEEDED=Migration Not Needed
-CONFIRMATION_TITLE=Confirm Migration
-OPEN_EDITORS_TITLE=Open Editors
-CONFIRM_MIGRATE_PROJECT_STRUCTURE=This will migrate the project structure for the selected items to the latest format. Continue?
-CONFIRM_MIGRATE_J2EE_13=This will migrate the project structure for the selected items if necessary, and migrate the J2EE version of the selected items from 1.2 to 1.3. Continue?
-INFORM_OPEN_EDITORS=Open editors exist in the workbench. Please close all editors before running migration.
-WEBCONTENT_LIBPATH_UPDATE_FAILED=Unable to remove JAR file from classpath.
-FAILED_DEPLOY_DELETE=Failed deleting deploy code in {0} project.
-COMPLETED_DEPLOY_DELETE=Completed delete of deploy code in {0} project.
-FAILED_LOCAL_CLIENT_CREATE=Failed creating local client view for {0}.
-COMPLETED_LOCAL_CLIENT_CREATE=Completed creation of a local client view for {0}.
-COMPLETED_CMP20_CODEGEN=Completed CMP 2.0 code generation in {0} project.
-LOCAL_CLIENT_NOT_NEEDED=A local client view was not created since one already exists for {0}.
-INVALID_SELECTION_TITLE=Invalid Selection
-INFORM_PROPER_SELECTION=Selection must be one enterprise application project or any combination of EJB, web, and application client module projects.
-REQUIRED_CLIENT_VIEW_TITLE=Client View Required
-CONFIRM_CLIENT_VIEW_REQUIRED=The following beans are required to have client views because of inheritance or relationship rules. These beans will be automatically selected and client views will be generated.
-FILES_OUT_OF_SYNC=Cannot migrate because some resources are out-of-sync with the file system in project {0}. Refresh the project and try again.
-DeleteModuleOperation_UI_0=No Projects to delete
-ResourceReferenceDataModel_UI_0=Type must be indicated.
-ResourceReferenceDataModel_UI_1=Authentication must be indicated.
-ReferenceDataModel_UI_3=No Owner for the reference has been indicated.
-ReferenceDataModel_UI_5=Reference name cannot be empty.
-ReferenceDataModel_UI_6=Reference name already exists.
-ServiceReferenceDataModel_ERROR_8=IWAE0041E A target Web Service must be selected.
-EJBReferenceDataModel_UI_10=Selected target EJB does not have local interfaces.
-EJBReferenceDataModel_UI_11=Selected target EJB does not have remote interfaces.
-EJBReferenceDataModel_UI_12=Target bean must be selected.
-PortComponentReferenceDataModel_ERROR_4=IWAE0042E Service Endpoint Interface must be indicated.
-MessageDestReferenceDataModel_7=Type must be indicated.
-MessageDestReferenceDataModel_8=Usage must be indicated.
-MessageDestReferenceDataModel_9=Link must be unique within EAR.
-ResourceEnvironmentReferenceDataModel_2=Type must be selected.
-RenameModuleOperation_UI_0=No Projects to rename.
-ServerTargetDataModel_UI_7=There are no available target servers.
-ServerTargetDataModel_UI_8=A target server must be set.
-ServerTargetDataModel_UI_9=Invalid target server selected.
-InvalidCharsError=Invalid character #.
-Remote_cannot_be_empty_UI_=Remote interface cannot be empty.
-Home_cannot_be_empty_UI_=Home interface cannot be empty.
-Local_home_cannot_be_empty_UI_=Local home interface cannot be empty.
-Local_cannot_be_empty_UI_=Local interface cannot be empty.
-
-USE_REMOTE_FOR_DIFFERENT_EAR=Best practice is to create 'remote' reference for an EJB if it's in different EAR.
-USE_LOCAL_FOR_DIFFERENT_EAR=Best pracitce is to create 'local' reference for an EJB if it's in same EAR.
-TARGET_ALSO_EXIST_IN_SAME_EAR=The selected EJB was detected in ''{0}'' EAR which contains the ''{1}'' module project . Did you mean to select the EJB from the ''{0}'' EAR?
-APP_CLIENT_ONLY_HAVE_REMOTE=Application client module can only have remote references.
-J2EE_1_2_ONLY_HAVE_REMOTE=J2EE 1.2 modules can only have remote references.
-COMPONENT_ALREADYINEAR=The specified component name is already in the EAR.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/j2eewtpplugin.properties b/plugins/org.eclipse.jst.j2ee/property_files/j2eewtpplugin.properties
deleted file mode 100644
index 4421e4e..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/j2eewtpplugin.properties
+++ /dev/null
@@ -1,55 +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
-###############################################################################
-Could_not_find_root_object_ERROR_=IWAE0001E Could not find root object in resource: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0002E An error occurred while saving.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0003E Cannot run J2EEUIWorkingCopyManager operation because the Workspace tree is locked.
-Unable_to_save_read_only_f_ERROR_=IWAE0004E Unable to save read-only file: {0}
-The_following_resources_ne_UI_=The following resources need to be saved but are currently shared, do you want to save now?
-Cannot_load_EJBFile_because_EJBEditModel_is_null_UI_=Cannot load EJBFile because EJBEditModel is null
-WARNING_METAFOLDER_MISSING_UI_=WARNING_METAFOLDER_MISSING
-Cannot_load_EJBFile_because_ejbNature_asEJBJarFile___returns_null_UI_=Cannot load EJBFile because ejbNature.asEJBJarFile() returns null
-EJBProjectResources_getEJBJar_EJBEditModel__UI_=EJBProjectResources.getEJBJar(EJBEditModel)
-Cannot_load_EJBJar_because_model_is_null_UI_=Cannot load EJBJar because model is null
-Cannot_load_EJBFile_because_EJBNatureRuntime_is_null_UI_=Cannot load EJBFile because EJBNatureRuntime is null
-WARNING_FILE_MISSING_UI_=WARNING_FILE_MISSING
-CoreException_could_not_initialize_Web_Service_class_path_variables_ERROR_=IWAE0005E CoreException could not initialize Web Service class path variables
-__Start_build_project_INFO_=IWAE0006I : Start build project
-__Bad_builder_order_for_project_INFO_=IWAE0007I : Bad builder order for project
-__No_imported_classes_folder__quitting_INFO_=IWAE0008I : No imported classes folder, quitting
-__Full_first_build_INFO_=IWAE0009I : Full/first build
-__Considering_delta_INFO_=IWAE0010I : Considering delta
-__Delta_build_INFO_=IWAE0011I : Delta build
-Minimizing_project_UI_=Minimizing project
-No_library_folder_UI_=No library folder
-Not_a_J2EE_project_UI_=Not a J2EE project
-No_source_types_UI_=No source types
-Some_source_types_have______in_their_name_ERROR_=IWAE0012E Some source types have \'$\' in their name
-RAR_File=RAR File
-Error_opening_archive_for_export_2=Error opening archive for export
-Error_getting_project_nature_runtime_3=Error getting project nature runtime
-Error_occurred_loading_ra_xml__4=Error occurred loading ra.xml:
-Creating_Connector_Project_5=Creating Connector Project
-Error_getting_project_nature_runtime_6=Error getting project nature runtime
-Error_occurred_saving_the_manifest_7=Error occurred saving the manifest
-_UI_ParamValue_type=Param:
-J2EEModulePostImportHelper_0=WEB
-J2EEModulePostImportHelper_1=EJB
-J2EEModulePostImportHelper_2=ApplicationClient
-J2EEModulePostImportHelper_3=Connector
-J2EEDeployOperation_UI_0=Deploying selected modules
-J2EEDeployOperation_UI_1=Fatal Exception occured
-J2EEDeployOperation_UI_Null_Status=Deployed successfully.
-J2EEDeployOperation_1_UI_=Deploying {0} Using {1}
-J2EEDeployOperation_2_UI_=Deployment from {0} completed successfully
-J2EEDeployOperation_3_UI_=Deployment from {0} had errors: {1} \r\n
-J2EEDeployOperation_4_UI_=Deploying {0}
-NESTED_JAVA_OUTPUT_ERROR=Nested Java output paths defined in .wtpmodules file are not allowed.
-
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/javacodegen.properties b/plugins/org.eclipse.jst.j2ee/property_files/javacodegen.properties
deleted file mode 100644
index 94b1a7d..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/javacodegen.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-No_source_package_fragment_EXC_=IWAE0001E No source package fragment root could be found.
-Specified_root_is_not_a_so_EXC_=IWAE0002E Specified root is not a source root.
-Project_name_not_specified_EXC_=IWAE0003E Project name not specified.
-An_analysis_import_can_onl_EXC_=IWAE0004E An analysis import can only be executed during run().
-If_this_generation_continu_WARN_=IWAE0005W If this generation continues, the Java source file \"{0}\" will be overwritten.
-Java_generation_requires_a_EXC_=IWAE0006E Java generation requires a JavaTopLevelGenerationHelper.
-The_prepare_method_can_o_EXC_=IWAE0007E The prepare() method can only be called during run().
-Member_generator_does_not__EXC_=IWAE0008E Member generator does not have a declaring type generator.
-Enclosing_compilation_unit_EXC_=IWAE0009E Enclosing compilation unit generator not found.
-Renames_of_main_types_are__EXC_=IWAE0010E Renames of main types are only supported in the Java code generation framework via a compilation unit rename.
-The_field_will_not_gen_INFO_=IWAE0011I The field \"{1}\" will not be generated because a non-generated field with the same name already exists.
-The_field_will_not_del_INFO_=IWAE0012I The field \"{0}\" will not be deleted because it is not marked generated.
-The_method_will_not_gen_INFO_=IWAE0013I The method \"{1}\" will not be generated because a non-generated method with the same signature already exists.
-The_method_will_not_del_INFO_=IWAE0014I The method \"{0}\" will not be deleted because it is not marked generated.
-The_type_will_not_gen_INFO_=IWAE0015I The type \"{1}\" will not be generated because a non-generated type with the same name already exists.
-The_type_will_not_del_INFO_=IWAE0016I The type \"{0}\" will not be deleted because it is not marked generated.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/projectsupport.properties b/plugins/org.eclipse.jst.j2ee/property_files/projectsupport.properties
deleted file mode 100644
index 5a4f0dc..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/projectsupport.properties
+++ /dev/null
@@ -1,39 +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
-###############################################################################
-Creating_Web_Project____UI_=Creating Web Project...
-The_path_for_the_links_sta_EXC_=IWAE0001E The path for the links state file is incorrect
-Syntax_Error_in_the_links_UI_=Syntax Error in the links state file
-Error_while_saving_links_s_EXC_=IWAE0002E Error while saving links state file
-Operation_failed_due_to_SA_ERROR_=IWAE0003E Operation failed due to SAX error:
-Operation_failed_due_to_IO_ERROR_=IWAE0004E Operation failed due to IO error:
-Operation_failed_due_to_Co_ERROR_=IWAE0005E Operation failed due to Core error:
-Operation_failed_due_to_Ja_ERROR_=IWAE0006E Operation failed due to Java Model error:
-_1concat_EXC_=IWAE0007E Error occured getting web.xml: {0}
-Error_importing_Module_Fil_EXC_=IWAE0008E Error importing Module File
-Cannot_clone_TaglibInfo_1_EXC_=IWAE0009E Cannot clone TaglibInfo
-Could_not_read_TLD_15=Could not read TLD
-File_Serving_Enabler_7=File Serving Enabler
-Auto_Generated___File_Enabler_9=Auto Generated - File Enabler
-Generated_by_Web_Tooling_23=Generated by Web Tooling
-Not_a_web_project_29=Not a web project
-A_web_project_must_be_open_and_must_exist_for_properties_to_be_edited_30=A web project must be open and must exist for properties to be edited
-Invalid_Servlet_Level_set_on_WebNature_3_EXC_=IWAE0010E Invalid Servlet Level set on WebNature
-Context_Root_cannot_be_empty_2=Context Root cannot be empty
-Names_cannot_begin_or_end_with_whitespace_5=Names cannot begin or end with whitespace
-The_character_is_invalid_in_a_context_root=The character {0} is invalid in a context root.
-Folder_name_cannot_be_empty_2=Folder name cannot be empty
-Folder_names_cannot_be_equal_4=Folder names cannot be equal
-Folder_name_cannot_be_the_same_as_Java_source_folder_5=Folder name cannot be the same as Java source folder
-Folder_name_cannot_be_the_same_as_Java_class_folder_6=Folder name cannot be the same as Java class folder
-Folder_name_is_not_valid=Folder name {0} is not valid
-Could_not_rename_____2=Could not rename: ''{0}'' already exists.
-Sync_WLP_Op=Synchronizing Web Library Projects\n\t
-Target_Update_Op=Updating target server for {0}\n\t
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/refactor.properties b/plugins/org.eclipse.jst.j2ee/property_files/refactor.properties
deleted file mode 100644
index 5999e14..0000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/refactor.properties
+++ /dev/null
@@ -1,21 +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:
-# BEA Systems, Inc. - initial API and implementation
-###############################################################################
-#This properties file contains string for refactoring logic
-
-pre_delete_not_received_for_removed=Missed PRE_DELETE event for removed project {0}, unable to update dependencies.
-pre_delete_not_received_for_renamed=Missed PRE_DELETE event for renamed project {0}, unable to update dependencies.
-invalid_property_name=Invalid property name: {0}
-task_name=Project refactoring
-missing_natures=Refactored project does not have either the ModuleCoreNature or JavaNature
-error_reading_manifest=Error reading manifest
-error_updating_project_on_delete=Error updating dependencies for deleted J2EE project {0}
-error_updating_project_on_rename=Error updating dependencies for renamed J2EE project {0}
-error_updating_server=Error updating server {0} on refactor of project {1}
diff --git a/plugins/org.eclipse.jst.j2ee/pushforpii.xml b/plugins/org.eclipse.jst.j2ee/pushforpii.xml
deleted file mode 100644
index a27d1e1..0000000
--- a/plugins/org.eclipse.jst.j2ee/pushforpii.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<project name="Translate" default="main" basedir=".">
-
-
- <!-- Setup temp variables -->
- <target name="init">
- <!-- If the user specifies a value for these variables, it overrides the values set in this target -->
- <property name="input.dir" value="D:\NLS\Corona\TVTReturns" />
- <property name="output.dir" value="D:\NLS\Corona\TVTProcessed" />
- <property name="v" value="true"/>
- <property name="WAS" value="WAS"/>
- <property name="WSAD" value="WSAD"/>
- <property name="product" value="${WSAD}"/>
-
- <taskdef name="goNative"
- classname="com.ibm.etools.ant.tasks.GoNative"
- classpath="D:\eclipse-SDK-3.0-win32\eclipse\plugins\com.ibm.rtp.tools_3.0.0\lib\tools.jar"/>
-
- <!-- Plugin vars -->
- <property name="emf.workbenchui.nl1" value="com.ibm.etools.emf.workbench.ui.nl1"/>
- <property name="j2eecore" value="com.ibm.etools.j2ee.core"/>
- <property name="j2ee.snippets.nl1" value="com.ibm.etools.j2ee.reference.snippets.nl1"/>
- <property name="j2ee.ui.nl1" value="com.ibm.etools.j2ee.ui.nl1"/>
- <property name="project.interchange.nl1" value="com.ibm.etools.project.interchange.nl1"/>
- <property name="validation.nl1" value="com.ibm.etools.validation.nl1"/>
- <property name="validation.core" value="com.ibm.etools.validation.core"/>
- <property name="validation.ui.nl1" value="com.ibm.etools.validation.ui.nl1"/>
- <property name="wtp.activites.nl1" value="com.ibm.wtp.activities.nl1"/>
- <property name="annotations.controller.nl1" value="com.ibm.wtp.annotations.controller.nl1"/>
- <property name="annotations.core.nl1" value="com.ibm.wtp.annotations.core.nl1"/>
- <property name="annotations.ui.nl1" value="com.ibm.wtp.annotations.ui.nl1"/>
- <property name="wtp.common" value="com.ibm.wtp.common"/>
- <property name="common.navigator.nl1" value="com.ibm.wtp.common.navigator.nl1"/>
- <property name="common.ui.nl1" value="com.ibm.wtp.common.ui.nl1"/>
- <property name="ejb.nl1" value="com.ibm.wtp.ejb.nl1"/>
- <property name="wtp.emf" value="com.ibm.wtp.emf"/>
- <property name="emf.workbench.edit.nl1" value="com.ibm.wtp.emf.workbench.edit.nl1"/>
- <property name="j2ee.nl1" value="com.ibm.wtp.j2ee.nl1"/>
- <property name="wtp.j2eeui.nl1" value="com.ibm.wtp.j2ee.ui.nl1"/>
- <property name="emf.workbench.edit.nl1" value="com.ibm.wtp.emf.workbench.edit.nl1"/>
- <property name="jca.nl1" value="com.ibm.wtp.jca.nl1"/>
- <property name="web.nl1" value="com.ibm.wtp.web.nl1"/>
- <property name="webservice.nl1" value="com.ibm.wtp.webservice.nl1"/>
- <property name="j2ee.ui.navigator.nl1" value="com.ibm.wtp.j2ee.ui.navigator.nl1"/>
- <property name="views.navigator.nl1" value="org.eclipse.ui.views.navigator.nl1"/>
- <property name="workbench.navigator.nl1" value="org.eclipse.ui.workbench.navigator.nl1"/>
- <property name="etools.ejb.ui.nl1" value="com.ibm.etools.ejb.ui.nl1"/>
- <property name="wtp.ejb.ui.nl1" value="com.ibm.wtp.ejb.ui.nl1"/>
-
-
-
- </target>
-
- <target name="main" depends="init">
-
- <!-- EMF Workbench UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="com.ibm.etools.emf.workbench.ui/property_files/commonappejb.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>
- <push name="com.ibm.etools.emf.workbench.ui/property_files/commonedit.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>
- <push name="commonfont_windows2000.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>
- <push name="emfui.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>
- </goNative>
-
- <!-- J2EE Core -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WAS}" verbose="${v}">
- <push name="commonarchive.properties" plugin="${j2eecore}/commonarchive"/>
- <push name="com.ibm.etools.j2ee.core/mofj2ee/ejb.properties" plugin="${j2eecore}/mofj2ee"/>
- <push name="j2eeplugin.properties" plugin="${j2eecore}/mofj2ee"/>
- <push name="j2eexml.properties" plugin="${j2eecore}/mofj2ee"/>
- <push name="mofj2ee.properties" plugin="${j2eecore}/mofj2ee"/>
- <push name="xmlparse.properties" plugin="${j2eecore}/mofj2ee"/>
- <push name="com.ibm.etools.j2ee.core/j2ee-validation/applicationclientvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
- <push name="com.ibm.etools.j2ee.core/j2ee-validation/earvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
- <push name="com.ibm.etools.j2ee.core/j2ee-validation/ejbvalidator.properties" plugin="${j2eecore}/j2ee-validation"/>
- <push name="com.ibm.etools.j2ee.core/j2ee-validation/erefvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
- <push name="com.ibm.etools.j2ee.core/j2ee-validation/rarvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
- <push name="com.ibm.etools.j2ee.core/j2ee-validation/warvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
- </goNative>
-
- <!-- J2EE Reference Snippets -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="ReferenceSnippetsPluginResources.properties" plugin="${j2ee.snippets.nl1}/property_files_nl1"/>
- </goNative>
-
- <!-- J2EE UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="appclientarchiveui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="appclientui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="applicationeditor.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="com.ibm.etools.j2ee.ui/property_files/commonedit.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="connectorui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="earcreationui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="ejbarchiveui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="ejbcreationui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="connectorui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="ejbextui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="ejbui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="j2eeui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="rararchiveui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="webserviceui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="webui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="wizards.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
- <push name="com.ibm.etools.j2ee.ui/plugin.properties" plugin="${j2ee.ui.nl1}"/>
- </goNative>
-
- <!-- Project Interchange -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="projectinterchange.properties" plugin="${project.interchange.nl1}/property_files_nl1"/>
- <push name="com.ibm.etools.project.interchange/plugin.properties" plugin="${project.interchange.nl1}"/>
- </goNative>
-
- <!-- Validation -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${product}" verbose="${v}">
- <push name="com.ibm.etools.validation/property_files/validate_base.properties" plugin="${validation.nl1}/property_files_nl1"/>
- <push name="com.ibm.etools.validation/plugin.properties" plugin="${validation.nl1}"/>
- </goNative>
-
- <!-- Validation Core -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="com.ibm.etools.validation.core/property_files/validate_base.properties" plugin="${validation.core}/property_files"/>
- </goNative>
-
- <!-- Validation UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="validate_ui.properties" plugin="${validation.ui.nl1}/property_files_nl1"/>
- <push name="com.ibm.etools.validation.ui/plugin.properties" plugin="${validation.ui.nl1}"/>
- </goNative>
-
-
-
- <!-- WTP EMF -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="wftutils.properties" plugin="${wtp.emf}/wtpemf"/>
- </goNative>
-
- <!-- Annotation Controller -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="annotationcontroller.properties" plugin="${annotations.controller.nl1}/property_files_nl1"/>
- </goNative>
-
- <!-- Annotation Core -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="annotationcore.properties" plugin="${annotations.core.nl1}/property_files_nl1"/>
- </goNative>
-
- <!-- Annotation UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="taghandlerui.properties" plugin="${annotations.ui.nl1}/property_files_nl1"/>
- </goNative>
-
- <!-- WTP Common -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="wtp_common.properties" plugin="${wtp.common}/src"/>
- </goNative>
-
- <!-- WTP Common Navigator -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="wtpnavigator.properties" plugin="${common.navigator.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.common.navigator/plugin.properties" plugin="${common.navigator.nl1}"/>
- </goNative>
-
- <!-- WTP Common UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="wtpcommonui.properties" plugin="${common.ui.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.common.ui/plugin.properties" plugin="${common.ui.nl1}"/>
- </goNative>
-
- <!-- EJB -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="com.ibm.wtp.ejb/property_files/ejbarchiveops.properties" plugin="${ejb.nl1}/property_files_nl1"/>
- <push name="ejbcodegen.properties" plugin="${ejb.nl1}/property_files_nl1"/>
- <push name="ejbcreation.properties" plugin="${ejb.nl1}/property_files_nl1"/>
- <push name="ejbproviderlibraries.properties" plugin="${ejb.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.ejb/property_files/ejbvalidator.properties" plugin="${ejb.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.ejb/plugin.properties" plugin="${ejb.nl1}"/>
- </goNative>
-
-
-
-
- <!-- J2EE -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="appclientarchiveops.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="appclientcreation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="applicationclientvalidation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="applicationproviders.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="basecodegen.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.j2ee/property_files/commonedit.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="eararchiveops.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="earcreation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.j2ee/property_files/earvalidation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.j2ee/property_files/ejbarchiveops.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.j2ee/property_files/erefvalidation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="j2ee_common.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="j2eecreation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="j2eewtpplugin.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="javacodegen.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="projectsupport.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.j2ee/plugin.properties" plugin="${j2ee.nl1}"/>
- </goNative>
-
- <!-- WTP J2EE UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="ejb_figures.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
- <push name="ejb_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
- <push name="j2ee_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
- <push name="jca_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
- <push name="migwizards.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
- <push name="web_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
- <push name="webserviceui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.j2ee.ui/plugin.properties" plugin="${wtp.j2eeui.nl1}"/>
- </goNative>
-
- <!-- JCA -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="rar.properties" plugin="${jca.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.jca/property_files/rarvalidation.properties" plugin="${jca.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.jca/plugin.properties" plugin="${jca.nl1}"/>
- </goNative>
-
- <!-- Web -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="ProjectSupport.properties" plugin="${web.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.web/property_files/warvalidation.properties" plugin="${web.nl1}/property_files_nl1"/>
- <push name="web.properties" plugin="${web.nl1}/property_files_nl1"/>
- <push name="webedit.properties" plugin="${web.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.web/plugin.properties" plugin="${web.nl1}"/>
- </goNative>
-
- <!-- Web Services -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="webservice.properties" plugin="${webservice.nl1}/property_files_nl1"/>
- <push name="com.ibm.wtp.webservice/plugin.properties" plugin="${webservice.nl1}"/>
- </goNative>
-
- <!-- J2EE UI Navigator -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="com.ibm.wtp.j2ee.ui.navigator/plugin.properties" plugin="${j2ee.ui.navigator.nl1}"/>
- </goNative>
-
- <!-- Views Navigator -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="messages.properties" plugin="${views.navigator.nl1}/property_files_nl1"/>
- </goNative>
-
- <!-- Workbench Navigator -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="wbnavigator.properties" plugin="${workbench.navigator.nl1}/property_files_nl1"/>
- <push name="org.eclipse.ui.workbench.navigator/plugin.properties" plugin="${workbench.navigator.nl1}"/>
- </goNative>
-
- <!-- WTP Activities -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="com.ibm.wtp.activities/plugin.properties" plugin="${wtp.activites.nl1}"/>
- </goNative>
-
- <!-- Etools EJB UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="com.ibm.etools.ejb.ui/plugin.properties" plugin="${etools.ejb.ui.nl1}"/>
- </goNative>
-
- <!-- WTP EJB UI -->
- <goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
- <push name="com.ibm.wtp.ejb.ui/plugin.properties" plugin="${etools.ejb.ui.nl1}"/>
- </goNative>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee/readme.html b/plugins/org.eclipse.jst.j2ee/readme.html
deleted file mode 100644
index cb64bc0..0000000
--- a/plugins/org.eclipse.jst.j2ee/readme.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><title></title></head>
-<body>
-<pre>
-<!-- Enter your readme text below this line. -->
-
-
-
-
-
-
-
-
-<!-- Enter your readme text above this line. -->
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/ProjectDependencyCache.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/ProjectDependencyCache.java
deleted file mode 100644
index 75c5e2f..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/ProjectDependencyCache.java
+++ /dev/null
@@ -1,150 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Maintains a cache of project dependencies as represented by references in the .project file.
- *
- * XXX DependencyManagerGraph is being used instead now that inter-project dependencies have
- * dependent-module entries, however, this type of dependency representation might be useful if
- * we want to capture dependencies on projects not represented in the .component file.
- */
-public class ProjectDependencyCache {
-
- private static ProjectDependencyCache cache;
-
- public synchronized static ProjectDependencyCache getCache() {
- if (cache == null) {
- try {
- cache = new ProjectDependencyCache();
- } catch (CoreException ce) {
- Logger.getLogger().logError(ce);
- }
- }
- return cache;
- }
-
- /*
- * Map from target IProject to List of dependent IProjects
- */
- private final Map dependencyCache = new HashMap();
-
- /*
- * Map from dependent IProject to List of target IProject
- */
- private final Map referenceCache = new HashMap();
-
- /**
- * Creates and initializes the cache.
- */
- protected ProjectDependencyCache() throws CoreException {
- final IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- refreshDependencies(projects[i]);
- }
- }
-
- public synchronized IProject[] getDependentProjects(final IProject project) {
- List dependencies = (List) dependencyCache.get(project);
- if (dependencies == null) {
- return new IProject[0];
- }
- return (IProject[]) dependencies.toArray(new IProject[dependencies.size()]);
- }
-
- public synchronized void refreshDependencies(final IProject project) throws CoreException {
- List oldRefs = (List) referenceCache.get(project);
- if (oldRefs == null) {
- oldRefs = new ArrayList();
- }
- final IProject[] refProjects = project.getDescription().getReferencedProjects();
- final List newRefs = new ArrayList();
- for (int j = 0; j < refProjects.length; j++) {
- addDependency(refProjects[j], project);
- newRefs.add(refProjects[j]);
- oldRefs.remove(refProjects[j]);
- }
- referenceCache.put(project, newRefs);
-
- // need to cull the stale refs from the reverse map
- Iterator i = oldRefs.iterator();
- while (i.hasNext()) {
- removeDependency((IProject) i.next(), project);
- }
- }
-
- public synchronized void refreshDependenciesForTarget(final IProject target) throws CoreException {
- final IProject[] dependents= getDependentProjects(target);
- for (int i = 0; i < dependents.length; i++) {
- refreshDependencies(dependents[i]);
- }
- }
-
- public synchronized void removeProject(final IProject project) throws CoreException {
- // remove from the dependency cache
- dependencyCache.remove(project);
- // remove from the reference cache and clear the from the cache of all dependent projects
- List dependencies = (List) referenceCache.remove(project);
- if (dependencies != null) {
- final Iterator i = dependencies.iterator();
- while (i.hasNext()) {
- removeDependency((IProject) i.next(), project);
- }
- }
- }
-
- public synchronized void replaceProject(final IProject originalProject, final IProject newProject) throws CoreException {
- // rename dependencyCache entry
- dependencyCache.put(newProject, dependencyCache.remove(originalProject));
-
- // rename reference cache and clear the from the cache of all dependent projects
- List dependencies = (List) referenceCache.remove(originalProject);
- referenceCache.put(newProject, dependencies);
- if (dependencies != null) {
- final Iterator i = dependencies.iterator();
- while (i.hasNext()) {
- final IProject ref = (IProject) i.next();
- removeDependency(ref, originalProject);
- addDependency(ref, newProject);
- }
- }
- }
-
- private void removeDependency(final IProject target, final IProject dependent) {
- List dependentProjects = (List) dependencyCache.get(target);
- if (dependentProjects != null) {
- dependentProjects.remove(dependent);
- }
- }
-
- private void addDependency(final IProject target, final IProject dependent) {
- List dependentProjects = (List) dependencyCache.get(target);
- if (dependentProjects == null) {
- dependentProjects = new ArrayList();
- dependencyCache.put(target, dependentProjects);
- }
- if (!dependentProjects.contains(dependent)) {
- dependentProjects.add(dependent);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/RefactorResourceHandler.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/RefactorResourceHandler.java
deleted file mode 100644
index ba04f3a..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/RefactorResourceHandler.java
+++ /dev/null
@@ -1,67 +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.jst.j2ee.refactor;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Supports access to resource strings.
- */
-public class RefactorResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("refactor");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static void nlsConcatenationFinder() {
- // used to tag methods which have concatenated strings
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
deleted file mode 100644
index cc6386d..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
+++ /dev/null
@@ -1,152 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.refactor.listeners;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Implementation of <code>IElementChangedListener that updates mappings for src folders
- * in the .component file in response to changes in a project's Java classpath.
- */
-public class J2EEElementChangedListener implements IElementChangedListener {
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.IElementChangedListener#elementChanged(org.eclipse.jdt.core.ElementChangedEvent)
- */
- public void elementChanged(final ElementChangedEvent event) {
- processJavaElementDelta(event.getDelta());
- }
-
- private void processJavaElementDelta(final IJavaElementDelta delta) {
- final int kind = delta.getKind();
- if (kind == IJavaElementDelta.CHANGED) {
- final int flags = delta.getFlags();
- final IJavaElement element = delta.getElement();
- if ((flags & IJavaElementDelta.F_CHILDREN) == IJavaElementDelta.F_CHILDREN) {
- if (element instanceof IJavaModel) {
- final IJavaElementDelta[] children = delta.getChangedChildren();
- for (int i = 0; i < children.length; i++) {
- // handle all of the IJavaProject children
- processJavaElementDelta(children[i]);
- }
- } else if (element instanceof IJavaProject
- && (flags & IJavaElementDelta.F_CLASSPATH_CHANGED) != 0) {
- final IJavaProject jproject = (IJavaProject) element;
- final IProject project = jproject.getProject();
- // make certain this is a J2EE project
- if (ModuleCoreNature.getModuleCoreNature(project) != null) {
- try {
- alterMapping(delta.getAffectedChildren(), jproject, project);
- } catch (CoreException ce) {
- Logger.getLogger().logError(ce);
- }
- }
- }
- }
- }
- }
-
- /*
- * Adds or removes a resource mapping from the .component file.
- */
- private void alterMapping(final IJavaElementDelta[] children, final IJavaProject jproject,
- final IProject project) throws CoreException {
- for (int i = 0; i < children.length; i++) {
- final IJavaElementDelta delta = children[i];
- final IJavaElement element = delta.getElement();
- final int kind = delta.getKind();
- final int flags = delta.getFlags();
- if (element instanceof IPackageFragmentRoot) {
- final IPackageFragmentRoot root = (IPackageFragmentRoot) element;
- int cpeKind = IPackageFragmentRoot.K_SOURCE;
- try {
- cpeKind = root.getKind();
- } catch (JavaModelException jme) {
- // this is thrown if the folder corresponding to the CPE has been deleted
- // since it could represent another error, we need to set to binary to
- // avoid adding mappings for binary folders
- cpeKind = IPackageFragmentRoot.K_BINARY;
- }
-
- final IPath path = root.getPath().removeFirstSegments(1);
- WorkspaceJob job= null;
- // kind and flags for CP additions are somewhat sporadic; either:
- // -kind is ADDED and flags are 0
- // or
- // -kind is CHANGED and flags are F_ADDED_TO_CLASSPATH
- if (kind == IJavaElementDelta.ADDED ||
- (flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) == IJavaElementDelta.F_ADDED_TO_CLASSPATH) {
- // can only add if we know it is a src folder
- if (cpeKind == IPackageFragmentRoot.K_SOURCE) {
- job = new WorkspaceJob("J2EEComponentLinkAdditionJob") {
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- getDestinationFolder(project).createLink(path, 0, monitor);
- return Status.OK_STATUS;
- }
- };
- }
- // getting a kind = REMOVED and flags = 0 for removal of the folder (w/o removing the CPE), probably
- // should not be generated
- } else if ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) == IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) {
- job = new WorkspaceJob("J2EEComponentMappingRemovalJob") {
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- getDestinationFolder(project).removeLink(path, 0, monitor);
- return Status.OK_STATUS;
- }
- };
- }
- if (job != null) {
- job.setRule(project);
- job.schedule();
- }
- }
- }
- }
-
- /*
- * Retrieves the IVirtualFolder to which Java src folders should be mapped
- */
- private IVirtualFolder getDestinationFolder(final IProject project) throws CoreException {
- final IVirtualComponent c = ComponentCore.createComponent(project);
- c.create(0, null);
- final IVirtualFolder root = c.getRootFolder();
- if (J2EEProjectUtilities.isDynamicWebProject(project)) {
- // web projects map to WEB-INF/classes
- return root.getFolder(new Path(J2EEConstants.WEB_INF_CLASSES));
- }
- // all other J2EE project types (that are Java projects) map
- // Java src folders to the project root
- return root;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java
deleted file mode 100644
index 334d686..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java
+++ /dev/null
@@ -1,281 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.listeners;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectDeleteDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactoringDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRenameDataModelProvider;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.builder.DependencyGraphManager;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Listens for project rename/delete events and, if the project had the
- * ModuleCore nature, executes the appropriate logic to update
- * project references.
- */
-public final class ProjectRefactoringListener implements IResourceChangeListener, IResourceDeltaVisitor {
-
- /*
- * Map from name of deleted project to ProjectRefactorMetadata instances.
- */
- private final Map deletedProjectMetadata = new HashMap();
-
- /**
- * Maintains a cache of project depencencies;
- */
- //private final ProjectDependencyCache cache;
-
- //private boolean hasProcessedSavedState = false;
-
- public ProjectRefactoringListener() {//final ProjectDependencyCache dependencyCache) {
- //cache = dependencyCache;
- // force a refresh of the DependencyGraphManager; was hitting an NPE
- // in StructureEdit when the DGM was getting constructed during the receipt of the
- // first pre-delete event
- DependencyGraphManager.getInstance();
- }
-
- // XXX not very feasible to make workspace save participation work given the need to process the
- // pre-delete events
- /*private synchronized void processPendingEvents() {
- if (hasProcessedSavedState) {
- return;
- }
- hasProcessedSavedState = true;
- //process any project rename/delete events that have occurred prior to our activation
- try {
- ISavedState lastState = ResourcesPlugin.getWorkspace().addSaveParticipant(J2EEPlugin.getDefault(), this);
- if (lastState != null) {
- lastState.processResourceChangeEvents(this);
- }
- } catch (CoreException ce) {
- Logger.getLogger().logError(ce);
- }
- }*/
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(final IResourceChangeEvent event) {
- // if we haven't already processed the pending resource change events, process them
- //processPendingEvents();
-
- // need to capture PRE_DELETE events so that metadata about the
- // deleted project can be collected and cached
- try {
- /*if (event.getType() == IResourceChangeEvent.POST_BUILD) {
- // we get this event type when processing pending events
- IResource resource = event.getResource();
- IResourceDelta delta = event.getDelta();
- if (resource instanceof IProject && delta.getKind() == IResourceDelta.REMOVED) {
- cacheDeletedProjectMetadata((IProject)resource);
- } else {
- delta.accept(this);
- }
- } else */
- if (event.getType() == IResourceChangeEvent.PRE_DELETE) {
- // for now, only dependencies on ModuleCoreNature projects
- final IProject project = (IProject) event.getResource();
- if (ModuleCoreNature.getModuleCoreNature(project) != null) {
- cacheDeletedProjectMetadata(project);
- }
- } else {
- event.getDelta().accept(this);
- }
- } catch (CoreException ce) {
- Logger.getLogger().logError(ce);
- }
- }
-
- private synchronized void cacheDeletedProjectMetadata(final IProject project) {
- final ProjectRefactorMetadata metadata = new ProjectRefactorMetadata(project, ProjectRefactorMetadata.REFERER_CACHING);
- // precompute the metadata while the project still exists
- metadata.computeMetadata();
- metadata.computeServers();
- metadata.computeDependentMetadata(ProjectRefactorMetadata.REF_CACHING,
- DependencyGraphManager.getInstance().getDependencyGraph().getReferencingComponents(project));
- //, cache.getDependentProjects(project));
- deletedProjectMetadata.put(project.getName(), metadata);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(final IResourceDelta delta) throws CoreException {
- final IResource resource = delta.getResource();
- if (resource instanceof IWorkspaceRoot) {
- // delta is at the workspace root so keep going
- return true;
- } else if (resource instanceof IProject) {
- processProjectDelta((IProject) resource, delta);
- }
- return false;
- }
-
- /*
- * Process the project delta in a sync block.
- */
- private synchronized void processProjectDelta(final IProject project, final IResourceDelta delta) throws CoreException {
- final int kind = delta.getKind();
- final int flags = delta.getFlags();
-
- if (kind == IResourceDelta.REMOVED) {
- if (flags == 0) {
- // Remove all entries int the project dependency cache
- //cache.removeProject(project);
- // if the kind is REMOVED and there are no special flags, the project was deleted
- ProjectRefactorMetadata metadata = (ProjectRefactorMetadata) deletedProjectMetadata.remove(project.getName());
- // note: only projects with ModuleCoreNature will have cached metadata
- if (metadata != null) {
- processDelete(metadata);
- } else {
- // likely due to missing the pre-delete event, ignore for now
- //Logger.getLogger().logWarning(RefactorResourceHandler.getString("pre_delete_not_received_for_removed",
- //new Object[]{project.getName()}));
- }
- }
- } else if (kind == IResourceDelta.ADDED && wasRenamed(flags)) { // was renamed
- // get the original name
- final String originalName = delta.getMovedFromPath().lastSegment();
- //Logger.getLogger().logInfo("Added event for " + originalName + " with flags " + flags);
- // we get PRE_DELETE events on rename so retrieve this
- ProjectRefactorMetadata originalMetadata = (ProjectRefactorMetadata) deletedProjectMetadata.remove(originalName);
- // get the metadata for the new project
- final ProjectRefactorMetadata newMetadata = new ProjectRefactorMetadata(project);
- // note: only projects with ModuleCoreNature will have cached metadata
- if (originalMetadata != null) {
- newMetadata.computeMetadata();
- processRename(originalMetadata, newMetadata);
- // Rename all entries in the project dependency cache
- //cache.replaceProject(originalProject, project);
- } else {
- // likely due to missing the pre-delete event, so set the original to a metadata based on new project
- // and reset project to one based on original name
- //Logger.getLogger().logWarning(RefactorResourceHandler.getString("pre_delete_not_received_for_renamed", new Object[]{originalName + " " + flags}));
- }
- }
- //else if (kind == IResourceDelta.CHANGED || kind == IResourceDelta.ADDED) {
- // (re)compute the dependencies
- //cache.refreshDependencies(project);
- //}
- }
-
- /*
- * Determines if the project was renamed based on the IResourceDelta flags
- */
- private boolean wasRenamed(final int flags) {
- if ((flags & IResourceDelta.DESCRIPTION) > 0
- && (flags & IResourceDelta.MOVED_FROM) > 0) {
- return true;
- }
- return false;
- }
-
- /*
- * Processes the renaming of a project.
- */
- private void processRename(final ProjectRefactorMetadata originalMetadata, final ProjectRefactorMetadata newMetadata ) {
- WorkspaceJob job = new WorkspaceJob("J2EEProjectRenameJob") {
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- final IDataModel dataModel = DataModelFactory.createDataModel(new ProjectRenameDataModelProvider());
- dataModel.setProperty(ProjectRefactoringDataModelProvider.PROJECT_METADATA, newMetadata);
- dataModel.setProperty(ProjectRenameDataModelProvider.ORIGINAL_PROJECT_METADATA, originalMetadata);
- try {
- dataModel.getDefaultOperation().execute(monitor, null);
- } catch (Exception e) {
- final String msg = RefactorResourceHandler.getString("error_updating_project_on_rename", new Object[]{originalMetadata.getProjectName()});
- Logger.getLogger().logError(msg);
- Logger.getLogger().logError(e);
- return new Status(Status.ERROR, J2EEPlugin.PLUGIN_ID, 0, msg, e);
- }
- return Status.OK_STATUS;
- }
- };
- // XXX note: might want to consider switching to a MultiRule for optimization
- job.setRule(ResourcesPlugin.getWorkspace().getRoot());
- job.schedule();
- }
-
- /*
- * Processes the deletion of a project.
- */
- private void processDelete(final ProjectRefactorMetadata metadata) {
- WorkspaceJob job = new WorkspaceJob("J2EEProjectDeleteJob") {
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- final IDataModel dataModel = DataModelFactory.createDataModel(new ProjectDeleteDataModelProvider());
- dataModel.setProperty(ProjectRefactoringDataModelProvider.PROJECT_METADATA, metadata);
- try {
- dataModel.getDefaultOperation().execute(monitor, null);
- } catch (Exception e) {
- final String msg = RefactorResourceHandler.getString("error_updating_project_on_delete", new Object[]{metadata.getProjectName()});
- Logger.getLogger().logError(msg);
- Logger.getLogger().logError(e);
- return new Status(Status.ERROR, J2EEPlugin.PLUGIN_ID, 0, msg, e);
- }
- return Status.OK_STATUS;
- }
- };
- // XXX note: might want to consider switching to a MultiRule for optimization
- job.setRule(ResourcesPlugin.getWorkspace().getRoot());
- job.schedule();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext)
- */
-// public void doneSaving(ISaveContext context) {
-// }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext)
- */
-// public void prepareToSave(ISaveContext context) throws CoreException {
-// }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext)
- */
-// public void rollback(ISaveContext context) {
-// }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext)
- */
-// public void saving(ISaveContext context) throws CoreException {
-// // no state to be saved by the plug-in, but request a
-// // resource delta to be used on next activation.
-// context.needDelta();
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOp.java
deleted file mode 100644
index 5746dac..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOp.java
+++ /dev/null
@@ -1,42 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-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.CreateReferenceComponentsOp;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Extension of <code>CreateReferenceComponentsOp</code> that supports the optional creation of
- * the .component reference.
- */
-public class CreateOptionalReferenceOp extends CreateReferenceComponentsOp {
-
- private final boolean _createReferences;
-
- public CreateOptionalReferenceOp(IDataModel model, boolean createReferences) {
- super(model);
- _createReferences = createReferences;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- if (_createReferences) {
- addReferencedComponents(monitor);
- }
- addProjectReferences();
- return OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteDataModelProvider.java
deleted file mode 100644
index d06abee..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteDataModelProvider.java
+++ /dev/null
@@ -1,25 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ProjectDeleteDataModelProvider extends ProjectRefactoringDataModelProvider {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getDefaultOperation()
- */
- public IDataModelOperation getDefaultOperation() {
- return new ProjectDeleteOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteOperation.java
deleted file mode 100644
index 24e35fd..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteOperation.java
+++ /dev/null
@@ -1,75 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>ProjectRefactorOperation</code> that contains deletion-specific logic.
- */
-public class ProjectDeleteOperation extends ProjectRefactorOperation {
-
- public ProjectDeleteOperation(final IDataModel model) {
- super(model);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorOperation#updateProject(org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata)
- */
- protected void updateProject(final ProjectRefactorMetadata refactoredMetadata)
- throws ExecutionException {
- }
-
- /**
- * Updates the metadata for dependent projects
- * @throws ExecutionException
- */
- protected void updateDependentProjects(final ProjectRefactorMetadata refactoredMetadata,
- final IProgressMonitor monitor) throws ExecutionException {
- super.updateDependentProjects(refactoredMetadata, monitor);
- // update any server instance refs to the refactored project
- super.updateServerRefs(refactoredMetadata, null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorOperation#updateDependentEARProject(org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata)
- */
- protected void updateDependentEARProject(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
- final IDataModel dataModel = createDataModel(dependentMetadata, refactoredMetadata,
- new UpdateDependentEARonDeleteProvider());
- dataModel.getDefaultOperation().execute(null, null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorOperation#updateDependentModuleProject(org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata)
- */
- protected void updateDependentModuleProject(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
- final IDataModel dataModel = createDataModel(dependentMetadata, refactoredMetadata,
- new UpdateDependentModuleonDeleteProvider());
- dataModel.getDefaultOperation().execute(null, null);
- }
-
- private IDataModel createDataModel(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata,
- final AbstractDataModelProvider provider) {
- final IDataModel dataModel = DataModelFactory.createDataModel(provider);
- dataModel.setProperty(PROJECT_METADATA, refactoredMetadata);
- dataModel.setProperty(DEPENDENT_PROJECT_METADATA, dependentMetadata);
- return dataModel;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java
deleted file mode 100644
index edb4a01..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java
+++ /dev/null
@@ -1,314 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
-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.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-/**
- * IDataModel object property stored under the property name
- * {@link ProjectRefactoringDataModelProvider#PROJECT_METADATA}.
- *
- * Note: this class is not multi-thread safe.
- */
-public class ProjectRefactorMetadata {
-
- public static int NON_CACHING = 0;
- public static int REF_CACHING = 1;
- public static int REFERER_CACHING = 2;
-
- private int _virtualCompCaching = NON_CACHING;
- private final IProject _project;
- private IServer[] servers;
- private IVirtualComponent virtualComp = null;
- private final List dependentMetadata = new ArrayList();
- private boolean javaNature;
- private boolean moduleCoreNature;
- private IModule module;
- private boolean isEAR = false;
- private boolean isEJB = false;
- private boolean isWeb = false;
- private boolean isAppClient = false;
- private boolean isConnector = false;
- private boolean isUtility = false;
-
- public ProjectRefactorMetadata(final IProject project) {
- _project = project;
- }
-
- public ProjectRefactorMetadata(final IProject project, final int virtualCompCaching) {
- this(project);
- _virtualCompCaching = virtualCompCaching;
- }
-
- public void computeMetadata() {
- try {
- javaNature = _project.hasNature("org.eclipse.jdt.core.javanature"); //$NON-NLS-1$
- moduleCoreNature = ModuleCoreNature.getModuleCoreNature(_project) != null;
- if (moduleCoreNature) {
- if (_virtualCompCaching == REF_CACHING) {
- virtualComp = new RefCachingVirtualComponent(ComponentCore.createComponent(_project));
- } else if (_virtualCompCaching == REFERER_CACHING) {
- virtualComp = new RefererCachingVirtualComponent(ComponentCore.createComponent(_project));
- } else {
- virtualComp = ComponentCore.createComponent(_project);
- }
- final IFacetedProject facetedProject = ProjectFacetsManager.create(_project);
- module = ServerUtil.getModule(_project);
- isEAR = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE));
- isEJB = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE));
- isWeb = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
- isAppClient = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_APPCLIENT_MODULE));
- isConnector = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_CONNECTOR_MODULE));
- isUtility = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE));
- }
- } catch (CoreException ce) {
- Logger.getLogger().logError(ce);
- }
- }
-
- public void computeServers() {
- servers = ServerUtil.getServersByModule(module, null);
- }
-
- public IServer[] getServers() {
- return servers;
- }
-
- public void computeDependentMetadata(final int virtualComponentCaching, final IProject[] dependentProjects) {
- // get all referencing projects and execute the appropriate update operation for each one
- ProjectRefactorMetadata metadata;
- for (int i = 0; i < dependentProjects.length; i++) {
- final IProject dependentProject = dependentProjects[i];
- if (dependentProject.exists() && dependentProject.isOpen()) {
- metadata = new ProjectRefactorMetadata(dependentProjects[i], virtualComponentCaching);
- metadata.computeMetadata();
- dependentMetadata.add(metadata);
- }
- }
- }
-
- /**
- * Retrieves the IProject that represents the referenced project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * Retrieves the IModule for the project, or null if no IModule representation
- * exists.
- */
- public IModule getModule() {
- return module;
- }
-
- /**
- * Retrieves the project name.
- */
- public String getProjectName() {
- return _project.getName();
- }
-
- /**
- * Retrieves all ProjectRefactorMetadata for dependent projects.
- * Will be empty if not computed.
- */
- public ProjectRefactorMetadata[] getDependentMetadata() {
- return (ProjectRefactorMetadata[]) dependentMetadata.toArray(new ProjectRefactorMetadata[dependentMetadata.size()]);
- }
-
- /**
- * Returns the IVirtualComponent for the project.
- */
- public IVirtualComponent getVirtualComponent() {
- return virtualComp;
- }
-
- public boolean hasJavaNature() {
- return javaNature;
- }
-
- public boolean hasModuleCoreNature() {
- return moduleCoreNature;
- }
-
- public boolean isEAR() {
- return isEAR;
- }
-
- public boolean isEJB() {
- return isEJB;
-
- }
-
- public boolean isWeb() {
- return isWeb;
- }
-
- public boolean isAppClient() {
- return isAppClient;
- }
-
- public boolean isConnector() {
- return isConnector;
- }
-
- public boolean isUtility() {
- return isUtility;
- }
-
- public class CachingVirtualComponent implements IVirtualComponent {
- protected final IVirtualComponent _comp;
- protected boolean _caching = true;
- public CachingVirtualComponent(final IVirtualComponent comp) {
- _comp = comp;
- }
- public void addReferences(IVirtualReference[] references) {
- _comp.addReferences(references);
- }
- public void create(int updateFlags, IProgressMonitor aMonitor) throws CoreException {
- _comp.create(updateFlags, aMonitor);
- }
- public boolean exists() {
- return _comp.exists();
- }
- public IVirtualComponent getComponent() {
- return _comp.getComponent();
- }
- public Properties getMetaProperties() {
- return _comp.getMetaProperties();
- }
- public IPath[] getMetaResources() {
- return _comp.getMetaResources();
- }
- public String getName() {
- return _comp.getName();
- }
- public String getDeployedName() {
- return _comp.getDeployedName();
- }
- public IProject getProject() {
- return _comp.getProject();
- }
- public IVirtualReference getReference(String aComponentName) {
- return _comp.getReference(aComponentName);
- }
- public IVirtualReference[] getReferences() {
- return _comp.getReferences();
- }
- public void setCaching(boolean caching) {
- _caching = caching;
- }
- public IVirtualComponent[] getReferencingComponents() {
- return _comp.getReferencingComponents();
- }
- public IVirtualFolder getRootFolder() {
- return _comp.getRootFolder();
- }
- public boolean isBinary() {
- return _comp.isBinary();
- }
- public void setMetaProperties(Properties properties) {
- _comp.setMetaProperties(properties);
- }
- public void setMetaProperty(String name, String value) {
- _comp.setMetaProperty(name, value);
- }
- public void setMetaResources(IPath[] theMetaResourcePaths) {
- _comp.setMetaResources(theMetaResourcePaths);
- }
- public void setReferences(IVirtualReference[] theReferences) {
- _comp.setReferences(theReferences);
- }
- public Object getAdapter(Class adapter) {
- return _comp.getAdapter(adapter);
- }
-
- public boolean equals(Object o) {
- return _comp.equals(o);
- }
-
- public int hashCode() {
- return _comp.hashCode();
- }
-
- public String toString() {
- return _comp.toString();
- }
-
- public void removeReference(IVirtualReference aReference) {
- ((VirtualComponent)_comp).removeReference(aReference);
- }
- }
-
- public class RefCachingVirtualComponent extends CachingVirtualComponent {
- private IVirtualReference[] cachedRefs;
- public RefCachingVirtualComponent(final IVirtualComponent comp) {
- super(comp);
- cachedRefs = comp.getReferences();
- }
-
- public IVirtualReference getReference(String aComponentName) {
- IVirtualReference[] refs = getReferences();
- for (int i = 0; i < refs.length; i++) {
- IVirtualReference reference = refs[i];
- if (reference == null || reference.getReferencedComponent() == null) {
- return null;
- }
- if (reference.getReferencedComponent().getName().equals(aComponentName))
- return reference;
- }
- return null;
- }
- public IVirtualReference[] getReferences() {
- if (_caching) {
- return cachedRefs;
- }
- return super.getReferences();
- }
- }
-
- public class RefererCachingVirtualComponent extends CachingVirtualComponent {
- private IVirtualComponent[] cachedReferers;
- public RefererCachingVirtualComponent(final IVirtualComponent comp) {
- super(comp);
- cachedReferers = comp.getReferencingComponents();
- }
-
- public IVirtualComponent[] getReferencingComponents() {
- if (_caching) {
- return cachedReferers;
- }
- return _comp.getReferencingComponents();
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorOperation.java
deleted file mode 100644
index e5afab1..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorOperation.java
+++ /dev/null
@@ -1,200 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.DeletedModule;
-import org.eclipse.wst.server.core.internal.Module;
-
-/**
- * Abstract base class for project refactoring operations.
- */
-public abstract class ProjectRefactorOperation extends AbstractDataModelOperation
- implements ProjectRefactoringProperties {
-
- /**
- * Creates a new refactoring operation for the specified data model.
- * @param model The data model.
- */
- public ProjectRefactorOperation(final IDataModel model) {
- super(model);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) getProjectMetadata();
-
- // Update this project's metadata
- if (refactoredMetadata.hasModuleCoreNature()) {
- updateProject(refactoredMetadata);
- }
-
- // Update metadata for dependent projects
- updateDependentProjects(refactoredMetadata, monitor);
-
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Updates the project's own metadata.
- */
- protected abstract void updateProject(final ProjectRefactorMetadata refactoredMetadata)
- throws ExecutionException;
-
- /**
- * Updates the metadata for dependent projects
- * @throws ExecutionException
- */
- protected void updateDependentProjects(final ProjectRefactorMetadata refactoredMetadata,
- final IProgressMonitor monitor) throws ExecutionException {
- // get the metadata for all dependent projects
- final ProjectRefactorMetadata[] dependentMetadata = refactoredMetadata.getDependentMetadata();
- if (monitor != null) {
- monitor.beginTask(RefactorResourceHandler.getString("task_name"), dependentMetadata.length);
- }
- ProjectRefactorMetadata metadata;
- for (int i = 0; i < dependentMetadata.length; i++) {
- metadata = dependentMetadata[i];
- // if the project is an EAR, execute the update operation created by the
- // DependentEARUpdateProvider; if the project is a non-EAR project with the
- // module core nature, execute the appropriate update
- if (metadata.isEAR()) {
- updateDependentEARProject(metadata, refactoredMetadata);
- } else if (metadata.hasModuleCoreNature()) {
- updateDependentModuleProject(metadata, refactoredMetadata);
- }
- if (monitor != null) {
- monitor.worked(1);
- }
- }
- }
-
- /**
- * Updates any server references.
- */
- protected void updateServerRefs(final ProjectRefactorMetadata originalMetadata,
- final ProjectRefactorMetadata newMetadata)
- throws ExecutionException {
- final IModule originalModule = originalMetadata.getModule();
- if (originalModule == null) {
- // no module for the original project, so return
- return;
- }
- // Need to replace the original module with a DeletedModule
- final IModule[] toRemove = new IModule[1];
- toRemove[0] = new DeletedModule(originalModule.getId(), originalModule.getName(),
- originalModule.getModuleType());
-
- IModule newModule = null;
- IModule[] toAdd = new IModule[0];
- if (newMetadata != null) {
- newModule = newMetadata.getModule();
- if (newModule == null) {
- // no module for the new project, so return
- return;
- }
- // XXX Due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=124292,
- // need to ensure that the IModule for the renamed project has the
- // id and name for the renamed IProject and not the old name
- final IProject newProject = newModule.getProject();
- final IModuleType moduleType = newModule.getModuleType();
- newModule = new Module(((Module) newModule).getModuleFactory(), newProject.getName(), newProject.getName(), moduleType.getId(),
- moduleType.getVersion(), newProject);
- toAdd = new IModule[]{newModule};
- }
-
- final IServer[] server = originalMetadata.getServers();
- IServerWorkingCopy wc = null;
- for (int i = 0; i < server.length; i++) {
- try {
- wc = server[i].createWorkingCopy();
- List list = Arrays.asList(server[i].getModules());
- if (list.contains(originalModule)) {
- // remove the original and potentially add a new
- ServerUtil.modifyModules(wc, toAdd, toRemove, null);
- }
- } catch (CoreException ce) {
- throw new ExecutionException(RefactorResourceHandler.getString("error_updating_server",
- new Object[]{server[i].getId(), originalMetadata.getProjectName()}), ce);
- } finally {
- try {
- wc.saveAll(true, null);
- } catch (CoreException ce) {
- throw new ExecutionException(RefactorResourceHandler.getString("error_updating_server",
- new Object[]{server[i].getId(), originalMetadata.getProjectName()}), ce);
- }
- }
- }
- }
-
- /**
- * Updates the dependent EAR project to account for the refactoring of the referenced project.
- */
- protected abstract void updateDependentEARProject(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException;
-
- /**
- * Updates the dependent module project to account for the refactoring of the referenced project.
- */
- protected abstract void updateDependentModuleProject(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException;
-
- /**
- * Retrieves the ProjectRefactorMetadata property.
- */
- protected ProjectRefactorMetadata getProjectMetadata() {
- return (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
- }
-
- /**
- * Override to disable redo support
- * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo()
- */
- public boolean canRedo() {
- return false;
- }
-
- /**
- * Override to disable undo support.
- * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo()
- */
- public boolean canUndo() {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringDataModelProvider.java
deleted file mode 100644
index 53673ab..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringDataModelProvider.java
+++ /dev/null
@@ -1,54 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-public abstract class ProjectRefactoringDataModelProvider extends
- AbstractDataModelProvider implements ProjectRefactoringProperties {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_METADATA);
- return propertyNames;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#validate(java.lang.String)
- */
- public IStatus validate(String propertyName) {
- Iterator i = getPropertyNames().iterator();
- boolean valid = false;
- while (i.hasNext()) {
- if (i.next().equals(propertyName)) {
- valid = true;
- break;
- }
- }
- if (!valid) {
- return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, IStatus.OK,
- RefactorResourceHandler.getString("invalid_property_name", new Object[]{propertyName}), null);
- }
- return OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringProperties.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringProperties.java
deleted file mode 100644
index ddedb99..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringProperties.java
+++ /dev/null
@@ -1,34 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-public interface ProjectRefactoringProperties {
-
- /**
- * Name of the property that holds an instance of ProjectRefactorMetadata for the
- * refactored project.
- */
- public static final String PROJECT_METADATA = "ProjectRefactoringProperties.PROJECT_METADATA"; //$NON-NLS-1$
-
- /**
- * Name of the property that holds an instance of ProjectRefactorMetadata for the original version of
- * the refactored project.
- */
- public static final String ORIGINAL_PROJECT_METADATA = "ProjectRefactoringProperties.ORIGINAL_PROJECT_METADATA"; //$NON-NLS-1$
-
- /**
- * Name of the property that holds an instance of ProjectRefactorMetadata for the
- * dependent project.
- */
- public static final String DEPENDENT_PROJECT_METADATA = "ProjectRefactoringProperties.DEPENDENT_PROJECT_METADATA"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameDataModelProvider.java
deleted file mode 100644
index a485c04..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameDataModelProvider.java
+++ /dev/null
@@ -1,36 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ProjectRenameDataModelProvider extends ProjectRefactoringDataModelProvider
- implements ProjectRefactoringProperties {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(ORIGINAL_PROJECT_METADATA);
- return propertyNames;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getDefaultOperation()
- */
- public IDataModelOperation getDefaultOperation() {
- return new ProjectRenameOperation(model);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
deleted file mode 100644
index 00bbca7..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
+++ /dev/null
@@ -1,121 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.Property;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ProjectRenameOperation extends ProjectRefactorOperation {
-
- public ProjectRenameOperation(final IDataModel model) {
- super(model);
- }
-
- /**
- * Override to return the pre-rename metadata.
- */
- protected ProjectRefactorMetadata getProjectMetadata() {
- return (ProjectRefactorMetadata) model.getProperty(ProjectRenameDataModelProvider.ORIGINAL_PROJECT_METADATA);
- }
-
- /**
- * Updates the project's own metadata.
- */
- protected void updateProject(final ProjectRefactorMetadata originalMetadata)
- throws ExecutionException {
-
- // Update the project's .component file
- final ProjectRefactorMetadata refactoredMetadata = super.getProjectMetadata();
- StructureEdit core = null;
- try {
- core = StructureEdit.getStructureEditForWrite(refactoredMetadata.getProject());
- WorkbenchComponent component = core.getComponent();
- // if the deploy-name had been set to the old project name, update it to
- // the new project name
- if (component.getName().equals(originalMetadata.getProjectName())) {
- component.setName(refactoredMetadata.getProjectName());
- }
- // if there is a context-root property that had been set to the old project name, update it to
- // the new project name
- List propList = component.getProperties();
- for (int i = 0; i < propList.size(); i++) {
- final Property prop = (Property) propList.get(i);
- if (prop.getName().equals("context-root") && prop.getValue().equals(originalMetadata.getProjectName())) {
- propList.remove(i);
- final Property newProp = ComponentcoreFactory.eINSTANCE.createProperty();
- newProp.setName("context-root");
- newProp.setValue(refactoredMetadata.getProjectName());
- propList.add(newProp);
- break;
- }
- }
- } finally {
- if(core != null) {
- core.saveIfNecessary(null);
- core.dispose();
- }
- }
- }
-
- /**
- * Updates the metadata for dependent projects
- * @throws ExecutionException
- */
- protected void updateDependentProjects(final ProjectRefactorMetadata originalMetadata,
- final IProgressMonitor monitor) throws ExecutionException {
- super.updateDependentProjects(originalMetadata, monitor);
- // update any server instance refs to the refactored project
- final ProjectRefactorMetadata refactoredMetadata = super.getProjectMetadata();
- super.updateServerRefs(originalMetadata, refactoredMetadata);
- }
-
- /**
- * Updates the dependent EAR project to account for the renaming of the referenced project.
- */
- protected void updateDependentEARProject(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata originalMetadata) throws ExecutionException {
- final IDataModel dataModel = createDataModel(dependentMetadata, originalMetadata,
- new UpdateDependentEARonRenameProvider());
- dataModel.getDefaultOperation().execute(null, null);
- }
-
- /**
- * Updates the dependent module project to account for the renaming of the referenced project.
- */
- protected void updateDependentModuleProject(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata originalMetadata) throws ExecutionException {
- final IDataModel dataModel = createDataModel(dependentMetadata, originalMetadata,
- new UpdateDependentModuleonRenameProvider());
- dataModel.getDefaultOperation().execute(null, null);
- }
-
- private IDataModel createDataModel(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata originalMetadata,
- final AbstractDataModelProvider provider) {
- final ProjectRefactorMetadata refactoredMetadata = super.getProjectMetadata();
- final IDataModel dataModel = DataModelFactory.createDataModel(provider);
- dataModel.setProperty(PROJECT_METADATA, refactoredMetadata);
- dataModel.setProperty(DEPENDENT_PROJECT_METADATA, dependentMetadata);
- dataModel.setProperty(ORIGINAL_PROJECT_METADATA, originalMetadata);
- return dataModel;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEARDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEARDataModelProvider.java
deleted file mode 100644
index 73acaec..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEARDataModelProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.j2ee.refactor.operations;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class RemoveDeletedComponentFromEARDataModelProvider extends RemoveComponentFromEnterpriseApplicationDataModelProvider {
-
- private final ProjectRefactorMetadata _metadata;
- public RemoveDeletedComponentFromEARDataModelProvider(final ProjectRefactorMetadata metadata) {
- super();
- _metadata = metadata;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
- Map map = new HashMap();
- List components = (List) getProperty(TARGET_COMPONENT_LIST);
- for (int i = 0; i < components.size(); i++) {
- IVirtualComponent component = (IVirtualComponent) components.get(i);
- IProject project = component.getProject();
- String name = component.getName();
- if (_metadata.isWeb()) {
- name += ".war"; //$NON-NLS-1$
- } else if (_metadata.isEJB()) {
- name += ".jar"; //$NON-NLS-1$
- } else if (_metadata.isAppClient()) {
- name += ".jar"; //$NON-NLS-1$
- } else if (_metadata.isConnector()) {
- name += ".rar"; //$NON-NLS-1$
- }
- map.put(component, name);
- }
- return map;
- }
- return super.getDefaultProperty(propertyName);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteOp.java
deleted file mode 100644
index 549c8b5..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteOp.java
+++ /dev/null
@@ -1,72 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-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.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * EAR project when one of the referenced projects has been deleted.
- */
-public class UpdateDependentEARonDeleteOp extends UpdateDependentProjectOp {
-
- /**
- * Creates a new refactoring operation for the specified data model.
- * @param model The data model.
- */
- public UpdateDependentEARonDeleteOp(final IDataModel model) {
- super(model);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
- final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
- removeEARDependency(dependentMetadata, refactoredMetadata);
- return Status.OK_STATUS;
- }
-
- /**
- * Updates the dependent EAR project to account for the deletion of the referenced project.
- */
- protected static void removeEARDependency(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
-
- // create IVirtualComponents for the EAR and the refactored project
- final IVirtualComponent earComp = dependentMetadata.getVirtualComponent();
- final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
- final IProgressMonitor monitor = new NullProgressMonitor();
-
- // remove the dependency on the deleted project
- if (refactoredComp != null) {
- final IDataModel model = DataModelFactory.createDataModel(new RemoveDeletedComponentFromEARDataModelProvider(refactoredMetadata));
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- final List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modHandlesList.add(refactoredComp);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
- model.getDefaultOperation().execute(monitor, null);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteProvider.java
deleted file mode 100644
index 1a4f0ca..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteProvider.java
+++ /dev/null
@@ -1,23 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentEARonDeleteProvider extends UpdateDependentProjectDataModelProvider
- implements ProjectRefactoringProperties {
-
- public IDataModelOperation getDefaultOperation() {
- return new UpdateDependentEARonDeleteOp(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameOp.java
deleted file mode 100644
index 6e9058f..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameOp.java
+++ /dev/null
@@ -1,97 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-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.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata.RefCachingVirtualComponent;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * EAR project when a referenced project has been renamed.
- */
-public class UpdateDependentEARonRenameOp extends UpdateDependentProjectOp {
-
- public UpdateDependentEARonRenameOp(final IDataModel model) {
- super(model);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
- final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
- final ProjectRefactorMetadata originalMetadata = (ProjectRefactorMetadata) model.getProperty(ORIGINAL_PROJECT_METADATA);
- final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
-
- // create IVirtualComponents for the EAR and the refactored project
- final RefCachingVirtualComponent earComp = (RefCachingVirtualComponent) dependentMetadata.getVirtualComponent();
- final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
-
- if (refactoredComp == null) {
- return Status.OK_STATUS;
- }
-
- boolean hadReference = hadReference(dependentMetadata, originalMetadata) != null;
-
- // first, remove the dependency on the old project name via the
- // ProjectDeleteOperation
- UpdateDependentEARonDeleteOp.removeEARDependency(dependentMetadata, originalMetadata);
-
- // change to use not use caching
- earComp.setCaching(false);
-
- // add back a dependency on the renamed project
- if (refactoredMetadata.hasModuleCoreNature()) {
- // the refactored project was a module project
- final IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- final List depList = new ArrayList();
- depList.add(refactoredComp);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, depList);
- dm.getDefaultOperation().execute(monitor, null);
- } else if (refactoredMetadata.hasJavaNature()) {
- // the refactored project was a plain java project
- final IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, refactoredMetadata.getProjectName());
- migrationdm.getDefaultOperation().execute(new NullProgressMonitor(), null);
- final IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- final List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- targetCompList.add(refactoredComp);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
- CreateOptionalReferenceOp op = new CreateOptionalReferenceOp(refdm, hadReference);
- op.execute(monitor, null);
- } else {
- throw new ExecutionException(RefactorResourceHandler.getString("missing_natures"), null);
- }
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameProvider.java
deleted file mode 100644
index e9abc1b..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameProvider.java
+++ /dev/null
@@ -1,23 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentEARonRenameProvider extends UpdateDependentProjectRenameDataModelProvider
- implements ProjectRefactoringProperties {
-
- public IDataModelOperation getDefaultOperation() {
- return new UpdateDependentEARonRenameOp(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteOp.java
deleted file mode 100644
index 65a6e56..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteOp.java
+++ /dev/null
@@ -1,160 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * module project when one of the referenced projects has been deleted.
- */
-public class UpdateDependentModuleonDeleteOp extends UpdateDependentProjectOp {
-
- /**
- * Creates a new refactoring operation for the specified data model.
- * @param model The data model.
- */
- public UpdateDependentModuleonDeleteOp(final IDataModel model) {
- super(model);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
- final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
- removeModuleDependency(dependentMetadata, refactoredMetadata);
- return Status.OK_STATUS;
- }
-
- /**
- * Updates the dependent module project to account for the deletion of the referenced project.
- */
- protected static void removeModuleDependency(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
-
- // create IVirtualComponents for the dependent and the refactored project
- final IVirtualComponent dependentComp = dependentMetadata.getVirtualComponent();
- final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
- final IProgressMonitor monitor = new NullProgressMonitor();
-
- // Does the dependent project have a .component reference on the refactored project?
- final IVirtualReference ref = hadReference(dependentMetadata, refactoredMetadata);
- final boolean webLibDep = hasWebLibDependency(ref);
-
- // remove the component reference on the deleted project
- if (refactoredComp != null) {
- final IDataModel model = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, dependentComp);
- final List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modHandlesList.add(refactoredComp);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
- if (webLibDep) {
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,"/WEB-INF/lib"); //$NON-NLS-1$
- }
- model.getDefaultOperation().execute(monitor, null);
- }
-
- // update the manifest
- if (!webLibDep) {
- updateManifestDependency(refactoredMetadata, dependentMetadata, true);
- }
-
- // update the JAR dependency data
- IDataModel dataModel = DataModelFactory.createDataModel(new JARDependencyDataModelProvider());
- dataModel.setProperty(JARDependencyDataModelProperties.PROJECT_NAME, dependentMetadata.getProjectName());
- dataModel.setProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME, refactoredMetadata.getProjectName());
- dataModel.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE, JARDependencyDataModelProperties.JAR_MANIPULATION_REMOVE);
- dataModel.getDefaultOperation().execute(monitor, null );
-
- }
-
- protected static void updateManifestDependency(final ProjectRefactorMetadata refactoredMetadata,
- final ProjectRefactorMetadata dependentMetadata, final boolean remove) throws ExecutionException {
- final IVirtualComponent dependentComp = dependentMetadata.getVirtualComponent();
- final String dependentProjName = dependentMetadata.getProjectName();
- final String refactoredProjName = refactoredMetadata.getProjectName();
- final IVirtualFile vf = dependentComp.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI) );
- final IFile manifestmf = vf.getUnderlyingFile();
- final IProgressMonitor monitor = new NullProgressMonitor();
- final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, dependentProjName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- final ArchiveManifest manifest = getArchiveManifest(manifestmf);
- String[] cp = manifest.getClassPathTokenized();
- List cpList = new ArrayList();
- String newCp = refactoredProjName + ".jar";//$NON-NLS-1$
- for (int i = 0; i < cp.length; i++) {
- if (!cp[i].equals(newCp)) {
- cpList.add(cp[i]);
- }
- }
- if (!remove) {
- cpList.add(newCp);
- }
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
- updateManifestDataModel.getDefaultOperation().execute(monitor, null );
- }
-
- private static ArchiveManifest getArchiveManifest(final IFile manifestFile) throws ExecutionException {
- InputStream in = null;
- try {
- in = manifestFile.getContents();
- ArchiveManifest mf = new ArchiveManifestImpl(new Manifest(in));
- return mf;
- } catch (CoreException ce) {
- throw new ExecutionException(RefactorResourceHandler.getString("error_reading_manifest"), ce);
- } catch (IOException io) {
- throw new ExecutionException(RefactorResourceHandler.getString("error_reading_manifest"), io);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- //Ignore
- }
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteProvider.java
deleted file mode 100644
index c3365c6..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteProvider.java
+++ /dev/null
@@ -1,23 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentModuleonDeleteProvider extends UpdateDependentProjectDataModelProvider
- implements ProjectRefactoringProperties {
-
- public IDataModelOperation getDefaultOperation() {
- return new UpdateDependentModuleonDeleteOp(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameOp.java
deleted file mode 100644
index 7012f90..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameOp.java
+++ /dev/null
@@ -1,93 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata.RefCachingVirtualComponent;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * module project when a referenced project has been renamed.
- */
-public class UpdateDependentModuleonRenameOp extends UpdateDependentProjectOp {
-
- public UpdateDependentModuleonRenameOp(final IDataModel model) {
- super(model);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
- final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
- final ProjectRefactorMetadata originalMetadata = (ProjectRefactorMetadata) model.getProperty(ORIGINAL_PROJECT_METADATA);
- final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
-
- // create IVirtualComponents for the dependent project and the refactored project
- final RefCachingVirtualComponent dependentComp = (RefCachingVirtualComponent) dependentMetadata.getVirtualComponent();
- final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
-
- // Does the dependent project have a .component reference on the refactored project?
- final IVirtualReference ref = hadReference(dependentMetadata, originalMetadata);
- final boolean webLibDep = hasWebLibDependency(ref);
-
- // first, remove the dependency on the old project name via the
- // ProjectDeleteOperation
- UpdateDependentModuleonDeleteOp.removeModuleDependency(dependentMetadata, originalMetadata);
-
- // change to use not use caching
- dependentComp.setCaching(false);
-
- // add a reference to the renamed project
- if (refactoredComp != null) {
- final IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- final List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- targetCompList.add(refactoredComp);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, dependentComp);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
- if (webLibDep) {
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,"/WEB-INF/lib"); //$NON-NLS-1$
- }
- CreateOptionalReferenceOp op = new CreateOptionalReferenceOp(refdm, ref != null);
- op.execute(monitor, null);
- }
-
- // update the manifest, unless this was a web library dependency
- if (!webLibDep) {
- UpdateDependentModuleonDeleteOp.updateManifestDependency(refactoredMetadata, dependentMetadata, false);
- }
-
- // update the JAR dependency data
- IDataModel dataModel = DataModelFactory.createDataModel(new JARDependencyDataModelProvider());
- dataModel.setProperty(JARDependencyDataModelProperties.PROJECT_NAME, dependentMetadata.getProjectName());
- dataModel.setProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME, refactoredMetadata.getProjectName());
- dataModel.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE, JARDependencyDataModelProperties.JAR_MANIPULATION_ADD);
- dataModel.getDefaultOperation().execute(monitor, null );
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameProvider.java
deleted file mode 100644
index 291b40c..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameProvider.java
+++ /dev/null
@@ -1,23 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentModuleonRenameProvider extends UpdateDependentProjectRenameDataModelProvider
- implements ProjectRefactoringProperties {
-
- public IDataModelOperation getDefaultOperation() {
- return new UpdateDependentModuleonRenameOp(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectDataModelProvider.java
deleted file mode 100644
index 574fd40..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectDataModelProvider.java
+++ /dev/null
@@ -1,27 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.Set;
-
-public abstract class UpdateDependentProjectDataModelProvider extends ProjectRefactoringDataModelProvider
- implements ProjectRefactoringProperties {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(DEPENDENT_PROJECT_METADATA);
- return propertyNames;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectOp.java
deleted file mode 100644
index 011b95b..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectOp.java
+++ /dev/null
@@ -1,84 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Abstract base class for operations that update dependent projects when a
- * referenced project is refactored.
- */
-public abstract class UpdateDependentProjectOp extends AbstractDataModelOperation
- implements ProjectRefactoringProperties {
-
- /**
- * Creates a new refactoring operation for the specified data model.
- * @param model The data model.
- */
- public UpdateDependentProjectOp(final IDataModel model) {
- super(model);
- }
-
- /**
- * Does the dependent project have a .component reference on the refactored project?
- * @return IVirtualReference or null if one didn't exist.
- */
- protected static IVirtualReference hadReference(final ProjectRefactorMetadata dependentMetadata,
- final ProjectRefactorMetadata refactoredMetadata) {
- final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
- if (refactoredComp == null) {
- return null;
- }
- final IVirtualReference[] refs = dependentMetadata.getVirtualComponent().getReferences();
- IVirtualReference ref = null;
- for (int i = 0; i < refs.length; i++) {
- if (refs[i].getReferencedComponent().equals(refactoredComp)) {
- ref = refs[i];
- break;
- }
- }
- return ref;
- }
-
- /**
- * Returns true if the dependency was a web library dependency.
- * @param ref
- * @return
- */
- protected static boolean hasWebLibDependency(final IVirtualReference ref) {
- if (ref == null) {
- return false;
- }
- return ref.getRuntimePath().equals(new Path("/WEB-INF/lib")); //$NON-NLS-1$
- }
-
- /**
- * Override to disable redo support
- * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo()
- */
- public boolean canRedo() {
- return false;
- }
-
- /**
- * Override to disable undo support.
- * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo()
- */
- public boolean canUndo() {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectRenameDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectRenameDataModelProvider.java
deleted file mode 100644
index fe9d4fe..0000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectRenameDataModelProvider.java
+++ /dev/null
@@ -1,28 +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:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.Set;
-
-public abstract class UpdateDependentProjectRenameDataModelProvider extends ProjectRenameDataModelProvider
- implements ProjectRefactoringProperties {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(DEPENDENT_PROJECT_METADATA);
- return propertyNames;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.genmodel b/plugins/org.eclipse.jst.j2ee/rose/moduleMap.genmodel
deleted file mode 100644
index 3c01fa0..0000000
--- a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.genmodel
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.j2ee/earproject"
- editDirectory="/com.ibm.etools.j2ee/applicationedit" editorDirectory="/com.ibm.etools.j2ee.editor/src"
- modelPluginID="modulemap" modelName="Modulemap" editPluginClass="modulemap.provider.ModulemapEditPlugin"
- editorPluginClass="com.ibm.etools.j2ee.plugin.J2EEPlugin" updateClasspath="false"
- usedGenPackages="../../com.ibm.etools.j2ee.core/rose/j2ee.genmodel#//@genPackages.5 ../../com.ibm.etools.java.core/rose/javaModel.genmodel#//@genPackages.0 ../../com.ibm.etools.j2ee.core/rose/j2ee.genmodel#//@genPackages.1 ../../org.eclipse.emf.ecore/src/model/Ecore.genmodel#//@genPackages.0">
- <foreignModel>moduleMap.mdl</foreignModel>
- <foreignModel>WORKSPACE_ROOT</foreignModel>
- <foreignModel>../..</foreignModel>
- <genPackages prefix="Modulemap" basePackage="com.ibm.etools.ear" ecorePackage="modulemap.ecore#/">
- <genClasses ecoreClass="modulemap.ecore#//ModuleMapping">
- <genFeatures ecoreFeature="ecore:EAttribute modulemap.ecore#//ModuleMapping/projectName"/>
- <genFeatures ecoreFeature="ecore:EReference modulemap.ecore#//ModuleMapping/module"/>
- </genClasses>
- <genClasses ecoreClass="modulemap.ecore#//EARProjectMap">
- <genFeatures property="None" children="true" ecoreFeature="ecore:EReference modulemap.ecore#//EARProjectMap/mappings"/>
- <genFeatures property="None" children="true" ecoreFeature="ecore:EReference modulemap.ecore#//EARProjectMap/utilityJARMappings"/>
- </genClasses>
- <genClasses ecoreClass="modulemap.ecore#//UtilityJARMapping">
- <genFeatures ecoreFeature="ecore:EAttribute modulemap.ecore#//UtilityJARMapping/projectName"/>
- <genFeatures ecoreFeature="ecore:EAttribute modulemap.ecore#//UtilityJARMapping/uri"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.mdl b/plugins/org.eclipse.jst.j2ee/rose/moduleMap.mdl
deleted file mode 100644
index 71f26c9..0000000
--- a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.mdl
+++ /dev/null
@@ -1,7323 +0,0 @@
-
-(object Petal
- version 44
- _written "Rose 7.1.9642.27"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- quid "3B7045650189"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid TRUE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "3B704565018B"
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "3B704565019E"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_category (object Class_Category "Logical View"
- quid "3B704565018A"
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "3B704565018C"
- logical_models (list unit_reference_list
- (object Class_Category "application"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WORKSPACE_ROOT\\com.ibm.etools.j2ee.core\\rose\\application.cat"
- quid "38C03008014E")
- (object Class_Category "modulemap"
- quid "3B7045BB0314"
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "ModuleMapping"
- quid "3B704601006B"
- class_attributes (list class_attribute_list
- (object ClassAttribute "projectName"
- quid "3B7047D600FC"
- type "String"
- exportControl "Public")))
- (object Class "EARProjectMap"
- quid "3B7046180227"
- realized_interfaces (list realize_rel_list
- (object Realize_Relationship
- quid "3B7046570029"
- supplier "Logical View::modulemap::ModuleMapping"
- quidu "3B704601006B")))
- (object Class "UtilityJARMapping"
- quid "3C570595009F"
- class_attributes (list class_attribute_list
- (object ClassAttribute "projectName"
- quid "3C5705D002AD"
- type "String"
- exportControl "Public")
- (object ClassAttribute "uri"
- quid "3C5705E2014A"
- type "String"
- exportControl "Public")))
- (object Association "$UNNAMED$0"
- quid "3B704663024D"
- roles (list role_list
- (object Role "mappings"
- quid "3B70466402A8"
- label "mappings"
- supplier "Logical View::modulemap::ModuleMapping"
- quidu "3B704601006B"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$1"
- quid "3B70466402B2"
- supplier "Logical View::modulemap::EARProjectMap"
- quidu "3B7046180227"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$2"
- quid "3B70480A00E3"
- roles (list role_list
- (object Role "module"
- quid "3B70480C0117"
- label "module"
- supplier "Logical View::application::Module"
- quidu "38C0322C0006"
- client_cardinality (value cardinality "1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$3"
- quid "3B70480C012C"
- supplier "Logical View::modulemap::ModuleMapping"
- quidu "3B704601006B"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$4"
- quid "3C5709D2010E"
- roles (list role_list
- (object Role "utilityJARMappings"
- quid "3C5709D3019B"
- label "utilityJARMappings"
- supplier "Logical View::modulemap::UtilityJARMapping"
- quidu "3C570595009F"
- client_cardinality (value cardinality "1..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$5"
- quid "3C5709D3019D"
- supplier "Logical View::modulemap::EARProjectMap"
- quidu "3B7046180227"
- is_aggregate TRUE))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "3B7045E600D1"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @1
- location (1184, 1504)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (778, 1304)
- fill_color 13434879
- nlines 8
- max_width 777
- label "These could have had a common supertype; however, we have to maintain compatilibility with existing documents from v4, so we can't change the hierarchy of ModuleMapping. We may decide later to add a common interface.")
- line_color 3342489
- fill_color 13434879
- width 837
- height 412)
- (object ClassView "Class" "Logical View::application::Module" @2
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1520, 800)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (1372, 671)
- fill_color 13434879
- nlines 1
- max_width 296
- justify 0
- label "Module")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "38C0322C0006"
- width 314
- height 282
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::modulemap::ModuleMapping" @3
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1504, 256)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @3
- location (1292, 175)
- fill_color 13434879
- nlines 1
- max_width 424
- justify 0
- label "ModuleMapping")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3B704601006B"
- width 442
- height 186
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$2" @4
- location (1520, 504)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3B70480A00E3"
- roleview_list (list RoleViews
- (object RoleView "module" @5
- Parent_View @4
- location (16, 248)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @6
- Parent_View @5
- location (1622, 594)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 172
- justify 0
- label "+module"
- pctDist 0.587413
- height 102
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3B70480C0117"
- client @4
- supplier @2
- line_style 3
- origin_attachment (1520, 504)
- terminal_attachment (1520, 659)
- label (object SegLabel @7
- Parent_View @5
- location (1574, 642)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "$UNNAMED$3" @8
- Parent_View @4
- location (16, 248)
- stereotype TRUE
- line_color 3342489
- quidu "3B70480C012C"
- client @4
- supplier @3
- line_style 3
- origin_attachment (1520, 504)
- terminal_attachment (1520, 349))))
- (object AttachView "" @9
- stereotype TRUE
- line_color 3342489
- client @3
- supplier @1
- line_style 3
- origin_attachment (1309, 348)
- terminal_attachment (1309, 1297))
- (object ClassView "Class" "Logical View::modulemap::UtilityJARMapping" @10
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (544, 800)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @10
- location (332, 669)
- fill_color 13434879
- nlines 2
- max_width 424
- justify 0
- label "UtilityJARMapping")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777088
- quidu "3C570595009F"
- width 442
- height 286
- annotation 8
- autoResize TRUE)
- (object AttachView "" @11
- stereotype TRUE
- line_color 3342489
- client @1
- supplier @10
- vertices (list Points
- (1088, 1297)
- (1088, 786)
- (765, 786))
- line_style 3
- origin_attachment (768, 1298)
- terminal_attachment (768, 943))
- (object ClassView "Class" "Logical View::modulemap::EARProjectMap" @12
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (544, 224)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @12
- location (376, 173)
- fill_color 13434879
- nlines 1
- max_width 336
- justify 0
- label "EARProjectMap")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3B7046180227"
- width 354
- height 126
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$0" @13
- location (1002, 216)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3B704663024D"
- roleview_list (list RoleViews
- (object RoleView "mappings" @14
- Parent_View @13
- location (730, -24)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @15
- Parent_View @14
- location (1227, 175)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 216
- justify 0
- label "+mappings"
- pctDist 0.800000
- height 42
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3B70466402A8"
- client @13
- supplier @3
- line_style 3
- origin_attachment (1002, 216)
- terminal_attachment (1283, 216)
- label (object SegLabel @16
- Parent_View @14
- location (1255, 270)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 1))
- (object RoleView "$UNNAMED$1" @17
- Parent_View @13
- location (730, -24)
- stereotype TRUE
- line_color 3342489
- quidu "3B70466402B2"
- client @13
- supplier @12
- line_style 3
- origin_attachment (1002, 216)
- terminal_attachment (721, 216))))
- (object AssociationViewNew "$UNNAMED$4" @18
- location (544, 471)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3C5709D2010E"
- roleview_list (list RoleViews
- (object RoleView "utilityJARMappings" @19
- Parent_View @18
- location (0, 247)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @20
- Parent_View @19
- location (341, 571)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 374
- justify 0
- label "+utilityJARMappings"
- pctDist 0.545946
- height 204
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3C5709D3019B"
- client @18
- supplier @10
- line_style 0
- label (object SegLabel @21
- Parent_View @19
- location (598, 637)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1..n"
- pctDist 0.897297
- height 54
- orientation 0))
- (object RoleView "$UNNAMED$5" @22
- Parent_View @18
- location (0, 247)
- stereotype TRUE
- line_color 3342489
- quidu "3C5709D3019D"
- client @18
- supplier @12
- line_style 0)))))))
- (object Class_Category "common"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WORKSPACE_ROOT\\com.ibm.etools.j2ee.core\\rose\\common.cat"
- quid "38C08F0F038D")
- (object Class_Category "ecore"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\src\\model\\org.eclipse.emf.Ecore.cat"
- quid "39A5ED04004E")
- (object Class_Category "java"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WORKSPACE_ROOT\\com.ibm.etools.java.core\\rose\\edocjava2.cat"
- quid "36549F2C004E"))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "3B7045650193"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Logical View::application" @23
- location (1136, 912)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @23
- location (992, 828)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "application")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "38C03008014E"
- width 300
- height 180)))))
- root_subsystem (object SubSystem "Component View"
- quid "3B704565018C"
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "3B704565019D"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- process_structure (object Processes
- quid "3B704565018D"
- ProcsNDevs (list
- (object Process_Diagram "Deployment View"
- quid "3B704565018F"
- title "Deployment View"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "classifierName"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "operationName"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "attributeName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isID"
- value FALSE)))
- (object Attribute
- tool "Ecore"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "referenceName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isResolveProxies"
- value TRUE)))
- (object Attribute
- tool "Cplusplus"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Cplusplus"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Const"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "InitialValue"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)))
- (object Attribute
- tool "Cplusplus"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "Copyright"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "RootPackage"
- value "C++ Reverse Engineered")
- (object Attribute
- tool "Cplusplus"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialBodyIncludes"
- value (value Text ""))))
- (object Attribute
- tool "Cplusplus"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "InitialCodeBody"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Inline"
- value FALSE)))
- (object Attribute
- tool "Cplusplus"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "HeaderSourceFile"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "BodySourceFile"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "IsNamespace"
- value FALSE)))
- (object Attribute
- tool "Cplusplus"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSI C++ Event Watcher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSIConvert"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada83"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada83"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada83"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada83"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada83"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada83"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada83"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada83"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada83"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "$ROSEADA83_SOURCE")))
- (object Attribute
- tool "Ada83"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ClassName"
- value "Object")
- (object Attribute
- tool "Ada83"
- name "ClassAccess"
- value ("ImplementationSet" 43))
- (object Attribute
- tool "Ada83"
- name "ImplementationType"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "PolymorphicUnit"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "HandleName"
- value "Handle")
- (object Attribute
- tool "Ada83"
- name "HandleAccess"
- value ("ImplementationSet" 45))
- (object Attribute
- tool "Ada83"
- name "Discriminant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada83"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ClassParameterName"
- value "This")
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada83"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "CopyConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada83"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada83"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ClassEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "HandleEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "IsTask"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada83"
- name "Private"
- value 43)
- (object Attribute
- tool "Ada83"
- name "LimitedPrivate"
- value 200)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "ConstructorKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada83"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada83"
- name "ClassParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada83"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada83"
- name "Separate"
- value 223)
- (object Attribute
- tool "Ada83"
- name "Spec"
- value 224)))
- (object Attribute
- tool "Ada83"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "In"
- value 204)
- (object Attribute
- tool "Ada83"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada83"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada83"
- name "FunctionReturn"
- value 206)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${relationship}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")))
- (object Attribute
- tool "Ada83"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${attribute}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada83"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada83"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${target}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada83"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada95"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada95"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada95"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada95"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada95"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada95"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada95"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "UseColonNotation"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada95"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada95"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "$ROSEADA95_SOURCE")))
- (object Attribute
- tool "Ada95"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "TypeName"
- value "Object")
- (object Attribute
- tool "Ada95"
- name "TypeVisibility"
- value ("TypeVisibilitySet" 43))
- (object Attribute
- tool "Ada95"
- name "TypeImplementation"
- value ("TypeImplementationSet" 208))
- (object Attribute
- tool "Ada95"
- name "TypeControl"
- value ("TypeControlSet" 225))
- (object Attribute
- tool "Ada95"
- name "TypeControlName"
- value "Controlled_${type}")
- (object Attribute
- tool "Ada95"
- name "TypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordImplementation"
- value ("RecordImplementationSet" 209))
- (object Attribute
- tool "Ada95"
- name "RecordKindPackageName"
- value "${class}_Record_Kinds")
- (object Attribute
- tool "Ada95"
- name "IsLimited"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessType"
- value ("GenerateAccessTypeSet" 230))
- (object Attribute
- tool "Ada95"
- name "AccessTypeName"
- value "Handle")
- (object Attribute
- tool "Ada95"
- name "AccessTypeVisibility"
- value ("TypeVisibilitySet" 45))
- (object Attribute
- tool "Ada95"
- name "AccessTypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AccessClassWide"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "MaybeAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementation"
- value ("ParameterizedImplementationSet" 11))
- (object Attribute
- tool "Ada95"
- name "ParentClassName"
- value "Superclass")
- (object Attribute
- tool "Ada95"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada95"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada95"
- name "ArrayOfTypeName"
- value "Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfTypeName"
- value "Access_Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "ArrayOfAccessTypeName"
- value "Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfAccessTypeName"
- value "Access_Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "ArrayIndexDefinition"
- value "Positive range <>")
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterName"
- value "This")
- (object Attribute
- tool "Ada95"
- name "GenerateDefaultConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada95"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateCopyConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada95"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDestructor"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada95"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateTypeEquality"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "TypeEqualityName"
- value "${quote}=${quote}")
- (object Attribute
- tool "Ada95"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "TypeImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Tagged"
- value 208)
- (object Attribute
- tool "Ada95"
- name "Record"
- value 210)
- (object Attribute
- tool "Ada95"
- name "Mixin"
- value 211)
- (object Attribute
- tool "Ada95"
- name "Protected"
- value 44)
- (object Attribute
- tool "Ada95"
- name "Task"
- value 212)))
- (object Attribute
- tool "Ada95"
- name "RecordImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SingleType"
- value 209)
- (object Attribute
- tool "Ada95"
- name "MultipleTypes"
- value 213)))
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)
- (object Attribute
- tool "Ada95"
- name "Unconstrained"
- value 214)))
- (object Attribute
- tool "Ada95"
- name "TypeVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada95"
- name "Private"
- value 43)))
- (object Attribute
- tool "Ada95"
- name "SubprogramKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "TypeControlSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "None"
- value 225)
- (object Attribute
- tool "Ada95"
- name "InitializationOnly"
- value 226)
- (object Attribute
- tool "Ada95"
- name "AssignmentFinalizationOnly"
- value 227)
- (object Attribute
- tool "Ada95"
- name "All"
- value 228)))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Always"
- value 229)
- (object Attribute
- tool "Ada95"
- name "Auto"
- value 230)))))
- (object Attribute
- tool "Ada95"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsPrivate"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada95"
- name "Renames"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenerateOverriding"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterClassWide"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessOperation"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "EntryBarrierCondition"
- value "True")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Abstract"
- value 221)
- (object Attribute
- tool "Ada95"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada95"
- name "Renaming"
- value 222)
- (object Attribute
- tool "Ada95"
- name "Separate"
- value 223)
- (object Attribute
- tool "Ada95"
- name "Spec"
- value 224)))
- (object Attribute
- tool "Ada95"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "In"
- value 204)
- (object Attribute
- tool "Ada95"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada95"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada95"
- name "Access"
- value 220)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${relationship}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${attribute}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada95"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada95"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${target}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada95"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "CORBA"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "CORBA"
- name "IncludePath"
- value "")
- (object Attribute
- tool "CORBA"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "CORBA"
- name "WindowsShell"
- value 101)))))
- (object Attribute
- tool "CORBA"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "ConstValue"
- value "")
- (object Attribute
- tool "CORBA"
- name "ImplementationType"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Context"
- value "")
- (object Attribute
- tool "CORBA"
- name "OperationIsOneWay"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")
- (object Attribute
- tool "CORBA"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "CORBA"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Array"
- value 24)
- (object Attribute
- tool "CORBA"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "CORBA"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Data Modeler"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "project"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "DomainCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "SPPackageCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TriggerCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IndexCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedureCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TablePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DomainPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IndexPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedurePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyPrefix"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsDatabase"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TargetDatabase"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Location"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmSchema"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmDomainPackage"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSchemaPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DatabaseID"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DBMS"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsTable"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsView"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomain"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSPPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Synonymns"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpace"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SelectClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUpdatable"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "CheckOption"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "PersistToServer"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IsIdentity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "NullsAllowed"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ColumnType"
- value "Native")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OID"
- value FALSE)))
- (object Attribute
- tool "Data Modeler"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRelationship"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RIMethod"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrict"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrictName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicityName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsConstraint"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsTrigger"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsStoredProcedure"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsCluster"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpace"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "FillFactor"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "KeyList"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "CheckPredicate"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DeferalMode"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "InitialCheckTime"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInsertEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUpdateEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDeleteEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "RefOldTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefOldRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRow"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "WhenClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Language"
- value "SQL")
- (object Attribute
- tool "Data Modeler"
- name "ProcType"
- value "Procedure")
- (object Attribute
- tool "Data Modeler"
- name "IsDeterministic"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ParameterStyle"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ReturnedNull"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ExternalName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Parameter"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInParameter"
- value TRUE)
- (object Attribute
- tool "Data Modeler"
- name "IsOutParameter"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OperationID"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler Communicator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "framework"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Java"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Java"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "RootDir"
- value "")
- (object Attribute
- tool "Java"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Java"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UsePrefixes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "AutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ShowCodegenDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocDefaultAuthor"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultVersion"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultSince"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocNumAsterisks"
- value 0)
- (object Attribute
- tool "Java"
- name "MaxNumChars"
- value 80)
- (object Attribute
- tool "Java"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "Java"
- name "VM"
- value ("VMType" 200))
- (object Attribute
- tool "Java"
- name "ClassPath"
- value "")
- (object Attribute
- tool "Java"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "Java"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "Java"
- name "VMType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Sun"
- value 200)
- (object Attribute
- tool "Java"
- name "Microsoft"
- value 201)
- (object Attribute
- tool "Java"
- name "IBM"
- value 202)))
- (object Attribute
- tool "Java"
- name "InstanceVariablePrefix"
- value "m_")
- (object Attribute
- tool "Java"
- name "ClassVariablePrefix"
- value "s_")
- (object Attribute
- tool "Java"
- name "DefaultAttributeDataType"
- value "int")
- (object Attribute
- tool "Java"
- name "DefaultOperationReturnType"
- value "void")
- (object Attribute
- tool "Java"
- name "NoClassCustomDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GlobalImports"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "OpenBraceClassStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "OpenBraceMethodStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UseSpaces"
- value TRUE)
- (object Attribute
- tool "Java"
- name "SpacingItems"
- value 3)
- (object Attribute
- tool "Java"
- name "RoseDefaultCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "AsteriskCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavaCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocAuthor"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSince"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocVersion"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "Default_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")))
- (object Attribute
- tool "Java"
- name "Http_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "Default_EJB__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Abstract"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Native"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Synchronized"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "Java"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsNavigable"
- value TRUE)))
- (object Attribute
- tool "Java"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "propertyId"
- value "360000002")
- (object Attribute
- tool "Oracle8"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "Oracle8"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnName"
- value "_ID")
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnType"
- value "NUMBER(5,0)")
- (object Attribute
- tool "Oracle8"
- name "SchemaNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "SchemaNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNameSuffix"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "IsSchema"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "WhereClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeLength"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypePrecision"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeScale"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionOfREFS"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MethodKind"
- value ("MethodKindSet" 1903))
- (object Attribute
- tool "Oracle8"
- name "OverloadID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsReadNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsReadNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsSelfish"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "TriggerType"
- value ("TriggerTypeSet" 1801))
- (object Attribute
- tool "Oracle8"
- name "TriggerEvent"
- value ("TriggerEventSet" 1601))
- (object Attribute
- tool "Oracle8"
- name "TriggerText"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerReferencingNames"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerForEach"
- value ("TriggerForEachSet" 1701))
- (object Attribute
- tool "Oracle8"
- name "TriggerWhenClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "MethodKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MapMethod"
- value 1901)
- (object Attribute
- tool "Oracle8"
- name "OrderMethod"
- value 1902)
- (object Attribute
- tool "Oracle8"
- name "Function"
- value 1903)
- (object Attribute
- tool "Oracle8"
- name "Procedure"
- value 1904)
- (object Attribute
- tool "Oracle8"
- name "Operator"
- value 1905)
- (object Attribute
- tool "Oracle8"
- name "Constructor"
- value 1906)
- (object Attribute
- tool "Oracle8"
- name "Destructor"
- value 1907)
- (object Attribute
- tool "Oracle8"
- name "Trigger"
- value 1908)
- (object Attribute
- tool "Oracle8"
- name "Calculated"
- value 1909)))
- (object Attribute
- tool "Oracle8"
- name "TriggerTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "AFTER"
- value 1801)
- (object Attribute
- tool "Oracle8"
- name "BEFORE"
- value 1802)
- (object Attribute
- tool "Oracle8"
- name "INSTEAD OF"
- value 1803)))
- (object Attribute
- tool "Oracle8"
- name "TriggerForEachSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "ROW"
- value 1701)
- (object Attribute
- tool "Oracle8"
- name "STATEMENT"
- value 1702)))
- (object Attribute
- tool "Oracle8"
- name "TriggerEventSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "INSERT"
- value 1601)
- (object Attribute
- tool "Oracle8"
- name "UPDATE"
- value 1602)
- (object Attribute
- tool "Oracle8"
- name "DELETE"
- value 1603)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE"
- value 1604)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR DELETE"
- value 1605)
- (object Attribute
- tool "Oracle8"
- name "UPDATE OR DELETE"
- value 1606)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE OR DELETE"
- value 1607)))))
- (object Attribute
- tool "Oracle8"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "NullsAllowed"
- value TRUE)
- (object Attribute
- tool "Oracle8"
- name "Length"
- value "")
- (object Attribute
- tool "Oracle8"
- name "Precision"
- value "2")
- (object Attribute
- tool "Oracle8"
- name "Scale"
- value "6")
- (object Attribute
- tool "Oracle8"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsPrimaryKey"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "R2Editor"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ComponentTest"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "cg"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "compiler2.1__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "compiler3.0__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "cg"
- name "ClassKey"
- value "class")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "PutBodiesInSpec"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDefaultConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "DefaultConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateCopyConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "CopyConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDestructor"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DestructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DestructorKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateAssignmentOperation"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "AssignmentVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "AssignmentKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineAssignmentOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateEqualityOperations"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "EqualityVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "EqualityKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineEqualityOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "RelationalVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "RelationalKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StorageMgmtVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SubscriptVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "SubscriptKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "SubscriptResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DereferenceVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DereferenceKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "DereferenceResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IndirectionVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "IndirectionKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "IndirectionResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StreamVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ThreeKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)))
- (object Attribute
- tool "cg"
- name "KindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)))
- (object Attribute
- tool "cg"
- name "FriendKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "DeclareAndDefine"
- value 199)
- (object Attribute
- tool "cg"
- name "DeclareOnly"
- value 205)
- (object Attribute
- tool "cg"
- name "DoNotDeclare"
- value 206)))
- (object Attribute
- tool "cg"
- name "VisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)))))
- (object Attribute
- tool "cg"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value TRUE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "OperationKind"
- value ("OperationKindSet" 200))
- (object Attribute
- tool "cg"
- name "OperationKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateAbstractBody"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SpecialDeclReturnType"
- value "")
- (object Attribute
- tool "cg"
- name "OperationIsConst"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OperationIsExplicit"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "cg"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "BodyAnnotations"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Ordered"
- value TRUE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$relationship")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$relationship")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorName"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorType"
- value "")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")))
- (object Attribute
- tool "cg"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InstanceArguments"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "ContainerGet"
- value "$data.get($keys)")
- (object Attribute
- tool "cg"
- name "ContainerSet"
- value "$data.set($keys,$value)")
- (object Attribute
- tool "cg"
- name "QualifiedContainer"
- value "")
- (object Attribute
- tool "cg"
- name "AssocClassContainer"
- value "$supplier *")
- (object Attribute
- tool "cg"
- name "AssocClassInitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReference"
- value ("QualifiedGetSetByReferenceSet" 2))
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReferenceSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_GetSetByReference"
- value 2)))
- (object Attribute
- tool "cg"
- name "GenerateQualifiedGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "QualifiedGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineQualifiedGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateQualifiedSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "QualifiedSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineQualifiedSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AssocClassGetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GenerateAssocClassGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "AssocClassGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineAssocClassGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "AssocClassSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineAssocClassSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassForwardReferenceOnly"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$attribute")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtAttributeVisibility"
- value 211)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$attribute")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$attribute")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BodyReferenceOnly"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "DirectoryIsOnSearchList"
- value FALSE)
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "IsNamespace"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Indent"
- value 2)
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))))
- (object Attribute
- tool "MSVC"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "MSVC"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Version"
- value "5.0")))
- (object Attribute
- tool "MSVC"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCClassTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCClassTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Interface_Part"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Connection_Part"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Class_Factory"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionality"
- value ("CObjectFunctionalitySet" 0))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionalitySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Dynamic"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Dyncreate"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Serial"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "GenerateOverrideGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateDataGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DATA_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateFieldGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_FIELD_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMessageGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateMessageMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "OLEFactory"
- value ("OLEFactorySet" 0))
- (object Attribute
- tool "MSVC"
- name "OLEFactorySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Built_in"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Simple"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Licensed"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "OLEName"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLEClassID"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLECtlType"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLECtlType"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLETypeLib"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLETypeLibID"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMajor"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMinor"
- value "")
- (object Attribute
- tool "MSVC"
- name "GeneratePropPageIDs"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLEPropPageIDs"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateDispatchMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockProperties"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockFunctions"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DispatchDefValue"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateDispIdEnum"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISP_ID_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInterfaceMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "INTERFACE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "InitInterface"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateEventMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockEvents"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateEventSinkMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "PropNotifySinks"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ConnectionPointIID"
- value "")
- (object Attribute
- tool "MSVC"
- name "InheritanceType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLECommands"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCDeclares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCImplements"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ATL_Declares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateCOMMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "COM_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionPointMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_POINT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMsgMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GeneratePropertyMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "PROPERTY_MAP_Entries"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCOperationTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCOperationTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Virtual_Override"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Message_Handler"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dispatch_Handler"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Event_Firing_Function"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Event_Sink_Handler"
- value 5)
- (object Attribute
- tool "MSVC"
- name "Std_OLE_Method"
- value 6)
- (object Attribute
- tool "MSVC"
- name "Command_Parser"
- value 7)
- (object Attribute
- tool "MSVC"
- name "Property_Get_Function"
- value 8)
- (object Attribute
- tool "MSVC"
- name "Property_Set_Function"
- value 9)
- (object Attribute
- tool "MSVC"
- name "Property_Notify_Function"
- value 10)
- (object Attribute
- tool "MSVC"
- name "Macro_Generated_Function"
- value 11)))
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "BodyImage"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "MSVC"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Web Publisher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "COM"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "TypeKinds"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "enum"
- value 100)
- (object Attribute
- tool "COM"
- name "record"
- value 101)
- (object Attribute
- tool "COM"
- name "module"
- value 102)
- (object Attribute
- tool "COM"
- name "interface"
- value 103)
- (object Attribute
- tool "COM"
- name "dispinterface"
- value 104)
- (object Attribute
- tool "COM"
- name "coclass"
- value 105)
- (object Attribute
- tool "COM"
- name "alias"
- value 106)
- (object Attribute
- tool "COM"
- name "union"
- value 107)
- (object Attribute
- tool "COM"
- name "max"
- value 108)
- (object Attribute
- tool "COM"
- name "(none)"
- value 109)))
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "kind"
- value ("TypeKinds" 109))
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "dllname"
- value "")
- (object Attribute
- tool "COM"
- name "alias"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "filename"
- value "")
- (object Attribute
- tool "COM"
- name "library"
- value "")
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpfile"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "lcid"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "Visual Basic"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "InstancingSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "BaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 222)
- (object Attribute
- tool "Visual Basic"
- name "0"
- value 223)
- (object Attribute
- tool "Visual Basic"
- name "1"
- value 224)))
- (object Attribute
- tool "Visual Basic"
- name "OptionBase"
- value ("BaseSet" 222))
- (object Attribute
- tool "Visual Basic"
- name "OptionExplicit"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "OptionCompare"
- value ("CompareSet" 202))
- (object Attribute
- tool "Visual Basic"
- name "Instancing"
- value ("InstancingSet" 219))
- (object Attribute
- tool "Visual Basic"
- name "CompareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 202)
- (object Attribute
- tool "Visual Basic"
- name "Binary"
- value 203)
- (object Attribute
- tool "Visual Basic"
- name "Text"
- value 204)))))
- (object Attribute
- tool "Visual Basic"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "LibraryName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "AliasName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "IsStatic"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "ReplaceExistingBody"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "Visual Basic"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ImplementsDelegation"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ByVal"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ByRef"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Optional"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ParamArray"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ProjectFile"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportReferences"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "QuickImport"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportBinary"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "VisualStudio"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Web Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "XML_DTD"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "XML_DTD"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "XML_DTD"
- name "WindowsShell"
- value 101)))))
- (object Attribute
- tool "XML_DTD"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Entity_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Entity_PublicID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "NotationValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "InternalValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "ParameterEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ExternalEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "Notation_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Notation_PublicID"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "DefaultDeclType"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Assign All"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ComponentPath"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "HiddenTool"
- value FALSE))
- quid "3B704565018E"))
diff --git a/plugins/org.eclipse.jst.j2ee/rose/modulemap.ecore b/plugins/org.eclipse.jst.j2ee/rose/modulemap.ecore
deleted file mode 100644
index 00580f2..0000000
--- a/plugins/org.eclipse.jst.j2ee/rose/modulemap.ecore
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="modulemap"
- nsURI="http:///modulemap.ecore" nsPrefix="modulemap">
- <eClassifiers xsi:type="ecore:EClass" name="ModuleMapping">
- <eReferences name="module" eType="ecore:EClass ../../com.ibm.etools.j2ee.core/rose/application.ecore#//Module"
- lowerBound="1"/>
- <eAttributes name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EARProjectMap">
- <eReferences name="mappings" eType="#//ModuleMapping" upperBound="-1" containment="true"/>
- <eReferences name="utilityJARMappings" eType="#//UtilityJARMapping" lowerBound="1"
- upperBound="-1" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="UtilityJARMapping">
- <eAttributes name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eAttributes name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/DeployerExtension.exsd b/plugins/org.eclipse.jst.j2ee/schema/DeployerExtension.exsd
deleted file mode 100644
index d9d3c61..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/DeployerExtension.exsd
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="DeployerExtension" name="J2EE Deployer Extension"/>
- </appInfo>
- <documentation>
- The extension point gives the ability to extend deployer operations on J2EE artifacts, for eg, EJB deployment and Webservices deployment. Registration of the deployer is based on module type and server target.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="deployer"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="deployer">
- <complexType>
- <sequence>
- <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>
- <choice>
- <element ref="nature"/>
- <element ref="component"/>
- </choice>
- </sequence>
- <attribute name="deployer_class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="runtime">
- <complexType>
- <attribute name="runtime_server_id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="nature">
- <complexType>
- <attribute name="module_nature_id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="component">
- <complexType>
- <attribute name="component_type" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/EARModuleExtension.exsd b/plugins/org.eclipse.jst.j2ee/schema/EARModuleExtension.exsd
deleted file mode 100644
index cd9206d..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/EARModuleExtension.exsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="EARModuleExtension" name="EAR Module Extension"/>
- </appInfo>
- <documentation>
- The api's for EJB, JCA and Web modules are defined in plugins separate from J2EE plugin. Those plugins have dependencies on the J2EE plugin, but not vice versa. In order for code defined within the J2EE plugin to access api's in these modules we need this extension point.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="earModuleExtension"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="earModuleExtension">
- <complexType>
- <attribute name="extensionClass" type="string" use="required">
- <annotation>
- <documentation>
- The class for the module extension.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/EJBCommandExtension.exsd b/plugins/org.eclipse.jst.j2ee/schema/EJBCommandExtension.exsd
deleted file mode 100644
index 26ffe68..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/EJBCommandExtension.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="EJBCommandExtension" name="EJB Command Extension"/>
- </appInfo>
- <documentation>
- Mainly used to overwrite delete and update commands for ejb's. For eg the extension was used to overwrite delete bean command.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="command"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="command">
- <complexType>
- <sequence>
- <element ref="run"/>
- </sequence>
- <attribute name="key" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="run">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/ExtendedModuleImport.exsd b/plugins/org.eclipse.jst.j2ee/schema/ExtendedModuleImport.exsd
deleted file mode 100644
index 5c4b01a..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/ExtendedModuleImport.exsd
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="SpecializedModuleImport" name="Specialized Module Import"/>
- </appInfo>
- <documentation>
- This extension point gives the ability to treat a jar file which is not an ejb jar file as an ejb jar file during ejb jar import.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="ExtendedModuleImport"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="ExtendedModuleImport">
- <complexType>
- <attribute name="moduleType" type="string" use="required">
- <annotation>
- <documentation>
- moduleType attribute defines the module type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="factoryClass" type="string" use="required">
- <annotation>
- <documentation>
- factoryClass is the handler class for the extension point.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/J2EEModulePostImport.exsd b/plugins/org.eclipse.jst.j2ee/schema/J2EEModulePostImport.exsd
deleted file mode 100644
index c343716..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/J2EEModulePostImport.exsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="J2EEModulePostImport" name="J2EE Module Post Import"/>
- </appInfo>
- <documentation>
- This extension-point sends notification to all extensions when J2EEModules are imported. Each extension can specify a set of different module types to listen for or listen to them all. The default is to receive notification for all module types. Notification is sent
-to the specified class implementing com.ibm.etools.j2ee.J2EEModulePostImportHandler.
-
-Both of the following examples register for notification for all J2EEModule types, the first uses the defaults, while the second specifies each module type. To listen for only specific module types, use the second example and specify only the types to listen to.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="postImport"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="postImport">
- <complexType>
- <sequence>
- <element ref="module" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="module">
- <complexType>
- <attribute name="type" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/WSDLServiceHelper.exsd b/plugins/org.eclipse.jst.j2ee/schema/WSDLServiceHelper.exsd
deleted file mode 100644
index 3954682..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/WSDLServiceHelper.exsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="SpecializedModuleImport" name="Specialized Module Import"/>
- </appInfo>
- <documentation>
- This extension point gives the ability to treat a jar file which is not an ejb jar file as an ejb jar file during ejb jar import.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="wsdlHelper"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="wsdlHelper">
- <complexType>
- <attribute name="helperClass" type="string" use="required">
- <annotation>
- <documentation>
- helperClass is the handler class for the extension point.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/WebServiceClientGenerator.exsd b/plugins/org.eclipse.jst.j2ee/schema/WebServiceClientGenerator.exsd
deleted file mode 100644
index 0864a5c..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/WebServiceClientGenerator.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="WebServiceClientGenerator" name="Web Service Client Generator"/>
- </appInfo>
- <documentation>
- Extended by WAS or axis in generating web service client specific artifacts.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="generator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="generator">
- <complexType>
- <sequence>
- <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="runtime">
- <complexType>
- <attribute name="serverTarget" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/resourceEnvRefType.exsd b/plugins/org.eclipse.jst.j2ee/schema/resourceEnvRefType.exsd
deleted file mode 100644
index 2155bcb..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/resourceEnvRefType.exsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="resourceEnvRefType" name="Resource Environment Reference Type"/>
- </appInfo>
- <documentation>
- This extension point is used to add types to the drop down options available when creating or modifying Resource Environment References for a Application Client or EJB Project.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="reference"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="reference">
- <complexType>
- <attribute name="type" type="string" use="required">
- <annotation>
- <documentation>
- Valid resource environment reference types. Example: javax.jms.Topic
- </documentation>
- </annotation>
- </attribute>
- <attribute name="usage" use="required">
- <annotation>
- <documentation>
- The usage field is required. Valid types are Common, EJB Jar.
-A usage tag with the value Common indicates that the corresponding value will be avilable for all J2EE projects.
-A usage tag with the value EJB Jar indicates that the value is only applicable to EJB projects.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="Application Client">
- </enumeration>
- <enumeration value="EJB Jar">
- </enumeration>
- <enumeration value="Common">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="target-server-ids" type="string">
- <annotation>
- <documentation>
- list of target server id for this type
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of the extension:
-<pre>
- <extension
- point="org.eclipse.jst.j2ee.ui.resourceEnvRefType">
- <reference usage="Common" type="javax.sql.DataSource"/>
- <reference usage="EJB Jar" type="javax.jms.Topic"/>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- This extension point requires that the extension be defined in the plugin file of the extending plugin.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2003, 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/resourceRefType.exsd b/plugins/org.eclipse.jst.j2ee/schema/resourceRefType.exsd
deleted file mode 100644
index 4101126..0000000
--- a/plugins/org.eclipse.jst.j2ee/schema/resourceRefType.exsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee" id="resourceRefType" name="Resource Ref Type"/>
- </appInfo>
- <documentation>
- This extension point is used to add types to the drop down options available when creating or modifying Resource References for a Application Client or EJB Project.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="reference"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="reference">
- <complexType>
- <attribute name="type" type="string" use="required">
- <annotation>
- <documentation>
- Valid resource reference types. Example: javax.jms.Topic
- </documentation>
- </annotation>
- </attribute>
- <attribute name="usage" use="required">
- <annotation>
- <documentation>
- The usage field is required. Valid types are Common, EJB Jar.
-A usage tag with the value Common indicates that the corresponding value will be avilable for all J2EE projects.
-A usage tag with the value EJB Jar indicates that the value is only applicable to EJB projects.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="Application Client">
- </enumeration>
- <enumeration value="EJB Jar">
- </enumeration>
- <enumeration value="Common">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="target-server-ids" type="string">
- <annotation>
- <documentation>
- list of target server id for this resource reference target.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of the extension:
-<pre>
- <extension
- point="org.eclipse.jst.j2ee.ui.resourceRefType">
- <reference usage="Common" type="javax.jms.Queue"/>
- <reference usage="EJB Jar" type="javax.resource.cci.ConnectionFactory"/>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- This extension point requires that the extension be defined in the plugin file of the extending plugin.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2003, 2005 IBM Corporation and others.<br>
-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 <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/construction3.gif b/plugins/org.eclipse.jst.j2ee/smoke/construction3.gif
deleted file mode 100644
index e558d1a..0000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/construction3.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/detour.gif b/plugins/org.eclipse.jst.j2ee/smoke/detour.gif
deleted file mode 100644
index bf6cd86..0000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/detour.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/ejbrdb_smoke.html b/plugins/org.eclipse.jst.j2ee/smoke/ejbrdb_smoke.html
deleted file mode 100644
index e735fe9..0000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/ejbrdb_smoke.html
+++ /dev/null
@@ -1,787 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Author" content="Raymond Leung">
- <meta name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]">
- <title>EJB-RDB Mapping Smoke Test</title>
-</head>
-<body>
-
-<h2>
-EJB-RDB Mapping Smoke Test (07/12/01)</h2>
-
-<h3>
-Top-down Scenario (also tests meet-in-middle functions):</h3>
-
-<ol>
-<li>
-Open an empty workbench.</li>
-
-<li>
-Import university3.jar</li>
-
-<ol TYPE=a>
-<li>
-Select Menu "File/Import".</li>
-
-<li>
-Select "EJB Jar File" as import source. Hit the "Next" button.</li>
-
-<li>
-Enter the path name to the EJB Jar file "university3.jar" or use the "browse"
-button to locate the jar file.</li>
-
-<li>
-Give an EJB Project name "University".</li>
-
-<li>
-Hit the "Finish" button to import everything in the jar file.</li>
-
-<li>
-The wizard will take a while to import the EJB jar file.</li>
-
-<li>
-Verify that a project named "University" has been created in the Navigator
-view.</li>
-</ol>
-
-<li>
-Creating a Top-Down EJB-RDB Mapping</li>
-
-<ol TYPE=a>
-<li>
-Select the "University" project, right click to bring up the pop-up menu
-and select "New/Others...".</li>
-
-<li>
-A dialogue will come up. On the left pane, select "EJB". Then on the right
-pane, select "EJB to RDB Mapping".</li>
-
-<li>
-Hit the "Next" button.</li>
-
-<li>
-Accept the default to create a Top Down mapping. Hit the "Next" button.</li>
-
-<li>
-Accept the default for Target Database etc. and hit the "Next" button to
-go to the Advanced Option page.</li>
-
-<li>
-Mark the checkboxes for "VapFaculty", "VapInstructor" and "VapPartTimeInstructor"
-and leave the checkbox for "VapSubstituteInstructor" unchecked.</li>
-
-<li>
-Hit the "Finish" button. The wizard will now create the mappings.</li>
-
-<li>
-Expand the "university" project if it is not already expanded by clicking
-on the "+" sign.</li>
-
-<li>
-Expand along the folders "University/ejbModule/META-INF". Verify that there
-is a folder "Schema".</li>
-
-<li>
-Expand the folder "Schema" and verify there is a file "Schema.dbxmi" in
-it.</li>
-
-<li>
-Verify that there is also a file "Map.mapxmi" in the "META-INF" folder.</li>
-</ol>
-
-<li>
-Open the Mapping</li>
-
-<ol TYPE=a>
-<li>
-Select the file "Map.mapxmi".</li>
-
-<li>
-Double-click on it or select the menu item "Open" in the pop-up menu.</li>
-
-<li>
-Verify that the mapping editor is launched in the main window.</li>
-
-<li>
-Verify that at the upper left of the main window, the contents of the EJB
-Jar is displayed, "VapFaculty", "VapCourse"...</li>
-
-<li>
-Verify that at the upper right of the main window, the contents contains
-a database named "SAMPLE" containing RDB Tables "VAPFACULTY", "VAPCOURSE"...</li>
-
-<li>
-Verify that below the EJB Jar and RDB Table views is the Overview of the
-mapping. Verify that both columns (EJBs and Tables) are not empty.</li>
-
-<li>
-Look for the Outline View. If it is not open, it can be opened by selecting
-from the "Perspective" menu "Perspective/Show View/Outline".</li>
-
-<li>
-Verify that the outline view is not empty. Mappings are displayed using
-the symbol "<->".</li>
-</ol>
-
-<li>
-Verify that different types of attributes and nested beans are imported.</li>
-
-<ol TYPE=a>
-<li>
-Expand the "VapFaculty" EJB in the EJBs view.</li>
-
-<li>
-Verify that there is a "VapInstructor" EJB nested in it.</li>
-
-<li>
-Verify that there are attributes "hireDate", "name", "numberOfDependents",
-"salary", "facultyNumber", "address" and "deptSortKey". Verify that "facultyNumber"
-is a key.</li>
-
-<li>
-Verify that there are relationship roles "advisedStudents", "headsDepartment",
-"classes" and "department".</li>
-
-<li>
-Expand the "VapInstructor" EJB.</li>
-
-<li>
-Verify that there are two EJBs nested inside it: "VapSubstituteInstructor"
-and "VapPartTimeInstructor".</li>
-
-<li>
-Verify that there is also an attribute "terminationDate" under "VapInstructor".</li>
-</ol>
-
-<li>
-Verify that the correct leaf tables are created.</li>
-
-<ol TYPE=a>
-<li>
-Inspect the Tables view on the right hand side.</li>
-
-<li>
-Verify that there are tables "VAPFACULTY", "VAPINSTRUCTOR", "VAPPARTTIMEINSTRUCTOR".</li>
-
-<li>
-Verify that there is NO table named "VAPSUBSTITUTEINSTRUCTOR". Remember
-"VapSubstituteInstructor" wais not marked as a leaf table when the mapping
-was created.</li>
-</ol>
-
-<li>
-Verify that the various views are in sync.</li>
-
-<ol TYPE=a>
-<li>
-Collapse "VapFaculty" in the EJBs view.</li>
-
-<li>
-Select the "VapFaculty <-> VAPFACULTY" item (mapping) in the Outline
-view. Verify that the corresponding items in the EJBs view, Tables view
-and Overview view are selected.</li>
-
-<li>
-Select the "VapCourse <-> VAPCOURSE" item in the Outline view
-and verify the selected items in the other views are updated correspondingly.</li>
-
-<li>
-Now, go to the EJBs view (upper left in the main window) and select the
-"VapStudent" (single click). Verify that the "VapStudent <-> VAPSTUDENT"
-item in the Outline view is selected. Also verify that "VapStudent" is
-selected in the Overview view. However, the Tables view should still stay
-on "VAPCOURSE".</li>
-
-<li>
-Now, double-click "VapStudent" in the EJBs view, verify that "VAPSTUDENT"
-in the Tables view is selected and no other selections should change.</li>
-
-<li>
-Next, select "VAPSCHEDULEDCLASS" in the Tables view (upper right in the
-main window) and verify that the selected items in the Outline view and
-Overview view change to "VapScheduledClass" and "VapScheduledClass <->
-VAPSCHEDULEDCLASS" correspondingly. However, the selection in the EJBs
-view should still stay on "VapStudent".</li>
-
-<li>
-Now, double-click on "VAPSCHEDULEDCLASS" in the Tables view. verify that
-"VapSheduledClass" in the EJBs view is selected. No other selections should
-change.</li>
-
-<li>
-Now, select "VapDepartment" in the first column of the Overview view and
-verify that the corresponding items in the other views are updated.</li>
-
-<li>
-Now, select "VAPSTAFF" in the 2nd column of the Overview view and verify
-that the corresponding items in other views are updated.</li>
-</ol>
-
-<li>
-Verify nested EJB mappings</li>
-
-<ol TYPE=a>
-<li>
-Double-click on "VapFaculty" in the EJBs view. Verify that only "VAPFACULTY"
-in the Tables view is selected.</li>
-
-<li>
-Expand "VapFaculty" in the EJBs view. Double-click on "VapInstructor".
-Verify that both "VAPFACULTY" and "VAPINSTRUCTOR" are selected in the Tables
-view.</li>
-
-<li>
-Expand "VapInstructor" in the EJBs view. Double-click on "VapSubstituteInstructor".
-Verify that both "VAPFACULTY" and "VAPINSTRUCTOR" are selected in the Tables
-view, i.e. same as for "VapInstructor".</li>
-
-<li>
-Double-click on "VapPartTimeInstructor" in the EJBs view and verify that
-"VAPFACULTY", "VAPINSTRUCTOR" and "VAPPARTTIMEINSTRUCTOR" in Tables view
-are selected.</li>
-
-<li>
-Now, double-click on "VAPFACULTY" in Tables view. Verify that "VapFaculty",
-"VapInstructor", "VapSubstituteInstructor" and "VapPartTimeInstructor"
-in the EJBs view are selected. Also verify that the 4 corresponding mappings
-are selected in the Outline and Overview views.</li>
-
-<li>
-Double-click on "VAPINSTRUCTOR" in the Tables view. Verify that "VapInstructor",
-"VapSubstituteInstructor" and "VapPartTimeInstructor" in the EJBs view
-are selected. Also verify the 3 corresponding mappings are selected in
-the Outline and Overview views.</li>
-
-<li>
-Double-click on "VAPPARTTIMEINSTRUCTOR" in the Tables view. Verify that
-only "VapPartTimeInstructor" in the EJBs view is selected.</li>
-</ol>
-
-<li>
-Verify that deletion and undo/redo work</li>
-
-<ol TYPE=a>
-<li>
-Select "VapCourse <-> VAPCOURSE" mapping in the Outline view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and select "Delete".</li>
-
-<li>
-Verify that the row corresponding to this mapping in the Overview view
-disappeared.</li>
-
-<li>
-Verify that the mapping icons for "VapFaculty" in the EJBs view and "VAPFACULTY"
-in the Tables view now have a hollow circle indicating the items are not
-mapped.</li>
-
-<li>
-From the menu bar, select "Edit/Undo Remove" to undo the deletion. Verify
-that "VapFaculty" and "VAPFACULTY" reappear in the Overview view, the mapping
-"VapFaculty <-> VAPFACULTY" reappears in the Outline view and the mapping
-icons in the EJBs view and Tables view become solid again.</li>
-
-<li>
-Right-click on the "VapFaculty" item in the EJBs view to bring up the pop-up
-menu and select "Redo Remove". Verify that it goes back to the state before
-the undo step.</li>
-</ol>
-
-<li>
-Remove all tables. This is to prepare for the next two tests.</li>
-
-<ol TYPE=a>
-<li>
-Select all the tables in the Tables view by clicking on the first table
-and then holding down the shift-key and clicking on the last table.</li>
-
-<li>
-Select the "Delete" item from the "Edit" menu in the menu bar.</li>
-
-<li>
-Verify that there are no mappings, other than the root EJB <-> Database
-mapping, in the Overview and Outline views.</li>
-</ol>
-
-<li>
-Verify that copy and paste works.</li>
-
-<ol TYPE=a>
-<li>
-Select "VapStaff" in the EJBs view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and select "Copy".</li>
-
-<li>
-Move over to the Tables view, right-click on "SAMPLE" and select "Paste".</li>
-
-<li>
-Verify that a table "VAPSTAFF" is created and mappings are established
-between the attributes in "VapStaff" and the columns in "VAPSTAFF".</li>
-</ol>
-
-<li>
-Verify that drag and drop works.</li>
-
-<ol TYPE=a>
-<li>
-Select "VapDepartment" in the EJBs view.</li>
-
-<li>
-Drag and drop it onto "SAMPLE" in the Tables view.</li>
-
-<li>
-Verify that a table "VAPDEPARTMENT" is created and mappings are established
-between the attributes in "VapDepartment" and the columns in "VAPDEPARTMENT".</li>
-</ol>
-
-<li>
-Verify that there are no internal errors</li>
-
-<ol TYPE=a>
-<li>
-Because the EJBs cross reference each other and these cross references
-are mapped to foreign keys in Tables, the columns and their mappings are
-not complete until tables corresponding to all the EJBs are created. Expand
-the tables "VAPSTAFF" and "VAPDEPARTMENT" and click on some of the columns
-(especially the foreigh keys) to display their properties. Verify that
-there are no internal errors or exceptions.</li>
-</ol>
-
-<li>
-Verify add/delete mapping actions are properly enabled</li>
-
-<ol TYPE=a>
-<li>
-Select "VapStaff" on the EJBs view. (single click)</li>
-
-<li>
-Select "VAPSTAFF" on the Tables view. (single click)</li>
-
-<li>
-Verify that the icons for removing/creating mappings and matching items
-are disabled.</li>
-
-<li>
-Click on the menu item "EJB to RDB Mapping Editor" in the menu bar and
-verify that all the menu items for creating/removing mappings (including
-matching items) are disabled.</li>
-
-<li>
-Expand "VapStaff" in the EJBs view and select "salary".</li>
-
-<li>
-Expand "VAPSTAFF" in the Tables view and select "SALARY".</li>
-
-<li>
-Verify that the remove mapping icon is enabled.</li>
-
-<li>
-Verify that the "Remove Mapping" menu item is enabled in the "EJB to RDB
-Mapping Editor" menu.</li>
-</ol>
-
-<li>
-Remove mappings.</li>
-
-<ol TYPE=a>
-<li>
-Remove the mapping by clicking on the remove mapping icon (the scissors
-icon).</li>
-
-<li>
-Verify that the icons for "salary" and "SALARY" have a hollow circle indicating
-there are no mappings for the two items.</li>
-
-<li>
-Verify also that the corresponding items representing the mapping were
-removed from the Overview and Outline views.</li>
-
-<li>
-Go to the Overview view and expand "VapStaff" if it is not already expanded.</li>
-
-<li>
-Select all the items under "VapStaff" (but not "VapStaff" itself) in the
-first column. Use Shift-click or Ctrl-Click.</li>
-
-<li>
-Right click to bring up the pop-up menu and select "Delete".</li>
-
-<li>
-Verify all the mappings under "VapStaff" are deleted in both the Overview
-and Outline views.</li>
-
-<li>
-Verify the columns "SALARY", "NUMBER", "NAME" etc. still exist under "VAPSTAFF"
-in the Tables view. Only the mappings were deleted, not the columns themselves.</li>
-
-<li>
-Verify all the attributes under "VapStaff" and columns under "VAPSTAFF"
-have no mappings by inspecting their icons.</li>
-</ol>
-
-<li>
-Verify that "Remove Mapping" is enabled only when there are no sub-mappings.</li>
-
-<ol TYPE=a>
-<li>
-Select "VapStaff" in the EJBs view and select "VAPSTAFF" in the Tables
-view.</li>
-
-<li>
-Verify that the "Remove Mapping", "Match by Name" and "Match by Type" icons
-and menu itmes under "EJB to RDB Mapping Editor" are enabled. Verify that
-the "Create Mapping" menu item is disabled because there is already a mapping
-between "VapStaff" and "VAPSTAFF". We only deleted the mappings between
-the attributes and columns, not between the EJB and Table.</li>
-</ol>
-
-<li>
-Rename column (Prepare for Match by Type/Name)</li>
-
-<ol TYPE=a>
-<li>
-Find the Properties view. If it is not visible, you can add it to your
-workbench through the menu "Perspective/Show View/Properties".</li>
-
-<li>
-Select the Column "SALARY" in Table "VAPSTAFF".</li>
-
-<li>
-Go to the Properties view and click on the value of the property "Name".
-This will make the string editable.</li>
-
-<li>
-Move to the end of the string and add a "2", i.e. change the name from
-"SALARY" to "SALARY2".</li>
-
-<li>
-Hit the "Enter" key and verify that the name of the column is updated on
-all the other views.</li>
-</ol>
-
-<li>
-Match by Type/Name.</li>
-
-<ol TYPE=a>
-<li>
-With "VapStaff" selected in the EJBs view and "VAPSTAFF" in the Tables
-view, click the "Match by Name" icon or select the "Match by Name" menu
-item under the "EJB to RDB Mapping Editor" menu.</li>
-
-<li>
-Verify that "number", "name", "title", and "department" are mapped.</li>
-
-<li>
-Reselect "VapStaff" in the EJBs view and "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Verify that now only the "Match by Type" icon and menu item is enabled.</li>
-
-<li>
-Click the "Match by Type" icon.</li>
-
-<li>
-Verify that the "salary" attribute under "VapStaff" is mapped.</li>
-</ol>
-
-<li>
-Verify role / foreign key mapping.</li>
-
-<ol TYPE=a>
-<li>
-Double-click on "department" under "VapStaff". Verify that the "DEPARTMENT"
-foreign key under "VAPSTAFF" in the Tables view is selected.</li>
-
-<li>
-Double-click on "DEPARTMENT" under "VAPSTAFF" in the Tables view. Verify
-that two roles are selected in the EJBs view: the "department" role under
-"VapStaff" and the "staff" (reverse) role under "VapDepartment".</li>
-</ol>
-
-<li>
-Undo the creatation of mappings.</li>
-
-<ol TYPE=a>
-<li>
-Select the "Undo" menu item under the "Edit" menu to undo the "Match by
-Type" action.</li>
-
-<li>
-Select the "Undo" menu item again to undo the "Match by Name" action.</li>
-
-<li>
-Verify that all the items under "VapStaff" and "VAPSTAFF" are not mapped
-by inspecting their icons.</li>
-</ol>
-
-<li>
-Verify that mapping icons are enabled base on types.</li>
-
-<ol TYPE=a>
-<li>
-Select "salary" under "VapStaff" in the EJBs view.</li>
-
-<li>
-Select "SALARY" under "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Verify that the "Create Mapping", "Match by Type" and "Match by Name" icons
-and menu items are enabled.</li>
-
-<li>
-Select "NUMBER" under "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Verify that the "Create Mapping", "Match by Type" and "Match by Name" icons
-and menu items are now disabled.</li>
-</ol>
-
-<li>
-Verify Redo of Match commands work.</li>
-
-<ol TYPE=a>
-<li>
-Select "Redo Match by Name" under the "Edit" menu on the menu bar.</li>
-
-<li>
-Verify that now "number", "name", "title", and "department" are mapped.</li>
-
-<li>
-Verify there are no exceptions or internal errors.</li>
-
-<li>
-Select "Redo Match by Type" under the "Edit" menu on the menu bar.</li>
-
-<li>
-Verify that now "salary" is also mapped.</li>
-</ol>
-</ol>
-
-<h3>
-Bottom-Up Scenario:</h3>
-
-<ol>
-<li>
-Open an empty workbench or close all editors and delete the "University"
-project.</li>
-
-<li>
-Create a Database by importing the univeristy3.jar, creating a top-down
-mapping and then deleting everything except the tables in the database.</li>
-
-<ol TYPE=a>
-<li>
-Import university3.jar and create a Top-Down EJB-RDB Mapping as described
-in step 2 and 3 above.</li>
-
-<li>
-Expand "University/ejbModule/META-INF" in the Navigator view.</li>
-
-<li>
-Delete everything under the "University" project except "ejbModule/META-INF/Schema/Schema.dbxmi",
-especially the "Map.mapxmi", "ejb-jar.xmi", "ibm-ejb-jar-bnd.xmi", "ibm-ejb-jar-ext.xmi"
-files under "ejbModule/META-INF".</li>
-</ol>
-
-<li>
-Create a Bottom-Up Mapping.</li>
-
-<ol TYPE=a>
-<li>
-Select the project "University" in the Navigator view.</li>
-
-<li>
-Right-click to bring up the pop-up menu. Select "Generate for enterprise
-bean(s)/Create EJB to RDB Mapping".</li>
-
-<li>
-A "Create new EJB/RDB Mapping" dialog will come up with the "Bottom Up"
-option selected.</li>
-
-<li>
-Hit the "Finish" button.</li>
-
-<li>
-Verify that "ejb-jar.xml", "ibm-ejb-jar-ext.xmi" and "Map.mapxmi" are created
-under "ejbModule/META-INF".</li>
-
-<li>
-Verify that some java files are created under the "bottom/up" folder.</li>
-</ol>
-
-<li>
-Open the mapping.</li>
-
-<ol TYPE=a>
-<li>
-Select "Map.mapxmi" and double-click on it.</li>
-
-<li>
-Expand all the EJBs and verify that all the attributes and roles are mapped
-(i.e. the icons have solid circles)</li>
-
-<li>
-Verify that all the attributes have a type.</li>
-
-<li>
-Expand the EJB "Vapstaff".</li>
-
-<li>
-Verify that the "salary" attribute has a type "java.math.BigDecimal".</li>
-
-<li>
-Verify that the "number" attribute is a key (the icon has a key).</li>
-
-<li>
-Verify that the type for "number" is "byte[]".</li>
-
-<li>
-Verify that there is a role "department" and the type is "Vapdepartment".</li>
-</ol>
-
-<li>
-Verify that tables cannot be deleted.</li>
-
-<ol TYPE=a>
-<li>
-Select the table "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and verify that the "Delete" item
-is disabled.</li>
-
-<li>
-Click on the "Edit' menu on the menu bar and verify that the "Delete" item
-is disabled.</li>
-</ol>
-
-<li>
-Delete an EJB and undo.</li>
-
-<ol TYPE=a>
-<li>
-Select the EJB "Vapstaff" in the EJBs view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and select "Delete" to delete the
-EJB "Vapstaff".</li>
-
-<li>
-Verify that the EJB "Vapstaff" disappears from the EJBs view.</li>
-
-<li>
-Verify that there are no mappings in the Outline and Overview views that
-reference "Vapstaff" and "VAPSTAFF".</li>
-
-<li>
-Verify that there is no mappings in the Outline and Overview views that
-reference a null object.</li>
-
-<li>
-Select "Edit/Undo Remove" from the menu bar.</li>
-
-<li>
-Verify that the EJB "Vapstaff" reappears and all the mappings between "Vapstaff"
-and "VAPSTAFF" also reappear.</li>
-</ol>
-
-<li>
-Change the name of an EJB.</li>
-
-<ol TYPE=a>
-<li>
-Open the Properties view if it is not already open by selecting "Perspective/Show
-View/Properties".</li>
-
-<li>
-Select "Vapstaff" in the EJBs view.</li>
-
-<li>
-Click on the value field of the property "Name", i.e. the string "Vapstaff".
-This should enable editing of the cell.</li>
-
-<li>
-Change the string to "Vapstaff2". Hit the enter key.</li>
-
-<li>
-Verify that "Vapstaff" is now changed to "Vapstaff2" in the EJBs view as
-well as in the Overview and Outline views.</li>
-</ol>
-
-<li>
-Change properties of an EJB attribute.</li>
-
-<ol TYPE=a>
-<li>
-Select the "salary" attribute of "Vapstaff2".</li>
-
-<li>
-Go to the Properties view and change the name to "salary2".</li>
-
-<li>
-Hit the return key and verify that "salary" is changed to "salary2" everywhere.</li>
-
-<li>
-Click on the value field for "Type" in the Properties view. The field should
-turn into a combo box with a button on the right.</li>
-
-<li>
-Click on the button to reveal the list of possible types. Select a different
-type, say, "java.lang.Integer".</li>
-
-<li>
-Verify that the type of the "salary2" is changed in all the various views.</li>
-</ol>
-
-<li>
-Order of EJBs can be re-arranged by drag-and-drop.</li>
-
-<ol TYPE=a>
-<li>
-Select the EJB "Vapstaff2" in the EJBs view.</li>
-
-<li>
-Hold down the left mouse button and drag the item away from its location.
-A horizontal line should appear as an indication the new position of the
-dragged item. Move the mouse upwards until the line indicate that "Vapstaff2"
-will be the first item in the ejb-jar. Release the mouse button.</li>
-
-<li>
-Verify that "Vapstaff2" is now the first EJB in the ejb-jar.</li>
-</ol>
-
-<li>
-EJBs can be made subtypes by drag-and-drop.</li>
-
-<ol TYPE=a>
-<li>
-Select the EJB "Vapstaff2" in the EJBs view.</li>
-
-<li>
-Hold down the left mouse button and drag and drop it onto EJB "Vapstudent".</li>
-
-<li>
-Verify that "Vapstaff2" is now an unmapped subtype of "Vapstudent".</li>
-</ol>
-
-<li>
-Verify that the content of the Database cannot be changed.</li>
-
-<ol TYPE=a>
-<li>
-Select Table "VAPSTAFF". Click the left mouse button and drag the item
-away from its current location.</li>
-
-<li>
-Verify that no horizontal line appears and the order of the tables cannot
-be changed.</li>
-</ol>
-</ol>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/slippery.gif b/plugins/org.eclipse.jst.j2ee/smoke/slippery.gif
deleted file mode 100644
index 47ef4d9..0000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/slippery.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/smoke.html b/plugins/org.eclipse.jst.j2ee/smoke/smoke.html
deleted file mode 100644
index 0e3e174..0000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/smoke.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Generator" content="Lotus Word Pro">
- <meta name="GENERATOR" content="Mozilla/4.74 [en] (Windows NT 5.0; U) [Netscape]">
- <title>Body</title>
-</head>
-<body bgcolor="#FFFFFF">
-
-<h2>
-J2EE (EJB) Smoke Test</h2>
-
-<ol>
-<li>
-Open an empty workbench.</li>
-
-<li>
-Switch to the J2EE perspective: Perspective->Open->Other->J2EE</li>
-
-<ol>
-<li>
-Verify that the J2EE toolbar actions appear (create an EJB, create a Servlet,
-create an EJB project, create an Application Client module, create a Web
-Project, create EJB to RDB mapping, create and Enterprise Application)</li>
-
-<li>
-Verify that the J2EE view appears in the navigator frame. It will probably
-be empty.</li>
-
-<li>
-Verify that the appropriate New menu items are visible, these are the project
-actions from the toolbar, plus create a new EJB example</li>
-</ol>
-
-<li>
-Create a new EJB project for testing EJB creation. Press the "New EJB Project"
-toolbar button. Call the project "TestEJBs", use the default location,
-check the "Add to an EAR" option and call the ear "default_ear".</li>
-
-<ol>
-<li>
-Verify that a new EJB project called "TestEJBs" is created.</li>
-
-<ol>
-<li>
-The corresponding module should appear in the J2EE view in the EJB Modules
-folder. (175916 - the module does not appear until it contains at least
-one EJB.)</li>
-</ol>
-
-<li>
-Verify that a new EAR project called "default_app" is created.</li>
-
-<ol>
-<li>
-The corresponding module should appear in the J2EE view in the Enterprise
-Applications folder. It should contain the nested EJB module.</li>
-</ol>
-
-<li>
-Open "default_app" by double-clicking in the J2EE view. The EAR editor
-should be opened. Verify that the application.xml source looks good in
-the source page.</li>
-
-<li>
-Modify the module display name in the source page, switch to the General
-page and verify that the change is reflected. Verify that save is enabled
-for the application.xml. Save and close the editor. Re-open the editor
-and verify the description change.</li>
-
-<li>
-Modify the display name on the general page, and verify it in the source
-page. Save should be enabled, and the resource tab should be marked dirty
-(with a "*").</li>
-</ol>
-
-<li>
-Add a new session bean to the EJB module.</li>
-
-<ol>
-<li>
-Press the Create an Enterprise Java Bean toolbar button. This will
-launch the new Enterprise Java Bean wizard. Name the bean "Hello",
-select "Session bean" as the EJB type. Verify that the target project
-is already selected.</li>
-
-<br><img SRC="construction3.gif" height=43 width=49>(175845) Project selection
-is not being picked up from the J2EE view, so you'll need to manually select
-the project for now.
-<li>
-Provide the package name for the generated classes by entering "testing"
-into the first package name field. Verify that it propogates to the
-other fields.</li>
-
-<li>
-Press Finish to generate the Session bean classes.</li>
-
-<li>
-Open the Java perspective: Perspective->Open Perspective->Other...->Java.</li>
-
-<br><img SRC="detour.gif" height=21 width=68 align=ABSCENTER> For now this
-has to be done in the Java perspective, the generated classes will appear
-in the J2EE view under the EJB when 175608 is implemented.
-<ol>
-<li>
-In the package view, verify that the package "testing" appears under "TestEJBs\ejbModule".</li>
-
-<li>
-Verify that the files hello.java, hellobean.java, and hellohome.java exist.</li>
-
-<li>
-Switch to the J2EE view, the new EJB should appear under the "Test_EJB"
-module in "EJB Modules".</li>
-</ol>
-
-<li>
-Add a test method to Hello. Open the java editor on hellobean.java
-by double-clicking on it. Add a new method String sayHello(String)
-using the Java tooling like so:</li>
-
-<br> public String sayHello(String message) {
-<br> return "Hello, " + message + "!";
-<br> }
-<li>
-Add the method to the remote interface.</li>
-
-<br><img SRC="detour.gif" height=21 width=68 align=ABSCENTER> This is currently
-done manually, by copying and pasting the method into the remote interface.
-The method in the remote interface should appear like this:
-<br> public String sayHello(String
-message) throws java.rmi.RemoteException;
-<br>Use code assist, ctrl-Space to lookup RemoteException, to verify that
-the project's Java environment is working properly.
-<br>When 175610 is completed, there will be a "Promote to remote interface"
-menu item available on the specialized Bean class Java editor which will
-do this for you.</ol>
-
-<li>
-Open the EJB editor for "TestEJBs" by double-clicking on the module under
-"EJB Modules"</li>
-
-<ol>
-<li>
-The EJB editor should be opened. Verify that the source for the ejb-jar
-looks reasonable.</li>
-
-<br><img SRC="construction3.gif" height=43 width=49 align=TEXTTOP>(175817)
-Once we get our DTD's registered, add a step to use code-assist in the
-source page.
-<ol>
-<li>
-Verify that the EJB editor is working properly. Edit the display
-name field. When you tab out of that field, the display name in the
-J2EE view should be updated. Sitch to the source page and verify
-that the XML is also updated.</li>
-
-<br>Verify that source changes flow to the general page, too. In
-the source page, copy and paste the display-name element from the JAR to
-the Hello entity. The display-name element must be the first element
-under <session>. Switch to the general tab, select Hello in the
-Enterprise Beans list, and verify the display name you entered.</ol>
-</ol>
-
-<li>
-Generate Deployed code for Hello. Select the project TestEJBs, pop-up
-Generate for enterprise beans...->Generate deployed code. Make sure
-Hello is checked on the prompter, and hit finish.</li>
-
-<ol>
-<li>
-Switch to the Java perspective, and verify that three new .java files were
-generated and do not have compile errors. They are EJSRemoteStatelessHello.java,
-EJBRemoteStatelessHelloHome.java, and EJSStatelessHelloHomeBean.java.</li>
-</ol>
-
-<li>
-Generate RMIC code for Hello. Select the project TestEJBs, pop-up
-Generate for enterprise beans...->Generate RMIC stub and tie code.
-Make sure Hello is checked on the prompter, and hit finish.</li>
-
-<ol>
-<li>
-Switch to the Java perspective, and verify that a whole slew of incomprehensible
-classes were generated in multiple packages, some of which have names like
-_Hello_Stub.java, and _HelloHome_stub.java. Check the task list and
-make sure there are no compile errors. Even better, make sure the
-corresponding .class files exist in \bin\....</li>
-</ol>
-
-<li>
-<img SRC="slippery.gif" height=66 width=76>Next, testing with the unit
-test environment...</li>
-
-<ol>
-<li>
-</li>
-</ol>
-</ol>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.classpath b/plugins/org.eclipse.jst.servlet.ui/.classpath
deleted file mode 100644
index 539597f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="servlet_ui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.cvsignore b/plugins/org.eclipse.jst.servlet.ui/.cvsignore
deleted file mode 100644
index 50d757c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-servletui.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.servlet.ui/.project b/plugins/org.eclipse.jst.servlet.ui/.project
deleted file mode 100644
index c209be8..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.servlet.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>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a02391f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WTP Servlet UI Plug-in
-Bundle-SymbolicName: org.eclipse.jst.servlet.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.servlet.ui,
- org.eclipse.jst.servlet.ui.internal.actions,
- org.eclipse.jst.servlet.ui.internal.deployables,
- org.eclipse.jst.servlet.ui.internal.plugin,
- org.eclipse.jst.servlet.ui.internal.wizard,
- org.eclipse.jst.servlet.ui.project.facet
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ui.workbench,
- org.eclipse.jface,
- org.eclipse.jst.j2ee.ui,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.web,
- org.eclipse.wst.common.navigator.workbench,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.util,
- org.eclipse.jem,
- org.eclipse.emf.ecore,
- org.eclipse.jst.common.frameworks,
- org.eclipse.debug.ui,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.web.ui
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.servlet.ui/about.html b/plugins/org.eclipse.jst.servlet.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/build.properties b/plugins/org.eclipse.jst.servlet.ui/build.properties
deleted file mode 100644
index cabf56b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = servlet_ui/,\
- property_files/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html
-src.includes = plugin.xml,\
- plugin.properties
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
deleted file mode 100644
index 72944e9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif b/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.properties b/plugins/org.eclipse.jst.servlet.ui/plugin.properties
deleted file mode 100644
index 65daba1..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.properties
+++ /dev/null
@@ -1,38 +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
-###############################################################################
-
-create.web.module_ui_=Create a J2EE Web Module
-create.web.project_ui_=Create a J2EE Web module
-web.actions.description_ui_=Actions for J2EE Web Development
-create_servlet_ui_=Create Java Servlet file
-war.import.description_ui_=Import an external WAR file into an Web project
-war.import.action.description_ui_=Import WAR File...
-war.export.description_ui_=Export a Web project into a WAR file
-war.export.action.description_ui_=Export WAR File...
-WarexportWizard.name=WAR file
-WarexportWizard.description=Export a Web Module into an external WAR file
-WarImportWizard.name=WAR file
-WarImportWizard.description=Import an external WAR file into a Web Project
-web.category_ui_=Web
-web.project_ui_=Dynamic Web Project
-new.web.project.description_ui_=Create a Dynamic Web project
-ConvertWebProjectType=Convert Web Project
-convertWebProjectTypeAction.label=Convert to a Dynamic Web project...
-ConvertWebProjectTypeAction.tooltip=Web Module Conversion Wizard
-convertToDynamic=Convert to Web Module...
-ServletWebRegionWizard.name=Servlet
-ServletWebRegionWizard.description=Create a new Servlet
-ServletWebRegionWizard.title=New Servlet
-Servlet_UI_=Servlet...
-servletAnnotationDecorator=Servlet Annotation Decorator
-servletAnnotationDecorator.description=Adds a decorator to an annotated servlet.
-web-project-wizard-name = Web Project
-web-project-wizard-description = Create a Web project
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
deleted file mode 100644
index 1d33c4e..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!-- ====================================================== -->
-<!-- -->
-<!-- Purpose: Extension for the J2EE ACtion Sets -->
-<!-- Extension point: org.eclipse.ui.actionSets -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%web.category_ui_"
- description="%web.actions.description_ui_"
- visible="false"
- id="org.eclipse.jst.j2ee.J2eeMainActionSet2">
- <action
- label="%create.web.module_ui_"
- icon="icons/full/ctool16/newwar_wiz.gif"
- tooltip="%create.web.module_ui_"
- class="org.eclipse.jst.servlet.ui.internal.actions.NewWebComponentAction"
- toolbarPath="J2EEMain"
- id="org.eclipse.jst.servlet.ui.internal.actions.NewWebComponent">
- </action>
- </actionSet>
- </extension>
- <!--new servlet contribution-->
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%ServletWebRegionWizard.name"
- icon="icons/full/ctool16/newservlet_wiz.gif"
- category="org.eclipse.wst.web.ui"
- class="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard"
- id="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <description>
- %ServletWebRegionWizard.description
- </description>
- </wizard>
- </extension>
-
-
- <!-- Web Module Wizard -->
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%web.project_ui_"
- icon="icons/full/ctool16/newwar_wiz.gif"
- category="org.eclipse.wst.web.ui"
- class="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <description>
- %new.web.project.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%WarImportWizard.name"
- icon="icons/full/ctool16/importwar_wiz.gif"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard"
- id="org.eclipse.jst.servlet.ui.WebComponentImportWizard">
- <description>
- %WarImportWizard.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
-
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- name="%WarexportWizard.name"
- icon="icons/full/ctool16/exportwar_wiz.gif"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard"
- id="org.eclipse.jst.servlet.ui.WebComponentExportWizard">
- <description>
- %WarexportWizard.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.ui.extendableWizard">
- <extendableWizard
- id="org.eclipse.jst.servlet.ui.WebModuleCreationWizard">
- </extendableWizard>
- </extension>
- <!-- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%ConvertWebProjectType"
- description="%ConvertWebProjectType"
- visible="true"
- id="org.eclipse.jst.servlet.ui.internal.actions.ConvertToWebModuleTypeActionSet">
- <action
- label="%convertWebProjectTypeAction.label"
- tooltip="%ConvertWebProjectTypeAction.tooltip"
- menubarPath="project/additions"
- class="org.eclipse.jst.servlet.ui.internal.actions.ConvertToWebModuleTypeAction"
- enablesFor="1"
- id="convertToWebModuleTypeAction">
- <enablement>
- <and>
- <objectClass name="org.eclipse.core.resources.IProject"/>
- <objectState name="nature" value="org.eclipse.wst.web.StaticWebNature"/>
- </and>
- </enablement>
- </action>
- </actionSet>
- </extension> -->
-
- <extension
- point="org.eclipse.wst.common.navigator.workbench.commonWizard">
- <!-- Web New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Module">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- </or>
- </enablement>
- </commonWizard>
- <!-- New Servlet -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Module">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.WebApp">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.WebApp">
- </objectClass>
- </or>
- </enablement>
- </commonWizard>
- <!-- Web Import -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.servlet.ui.WebModuleImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.web.WebNature">
- </objectState>
- </and>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.web.WebNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- <!-- Web Export -->
- <!-- <commonWizard
- type="export"
- wizardId="org.eclipse.jst.servlet.ui.WebModuleExportWizard">
- <enablement>
- <or>
- <and>
- <or>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- </or>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.web.WebNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider">
- </objectClass>
-
- </or>
- </enablement>
- </commonWizard> -->
- <!-- Import Classes Wizard -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- </extension>
-
- <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web resources -->
-<!-- ==================================================================== -->
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.j2ee.webapplication.WebApp"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource2"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.server.core.Servlet"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource3"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource4"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource5"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webapplication.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webapplication.WebApp">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.server.core.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- </extension>
-
-<!-- ====================================================== -->
-<!-- Label Decorators -->
-<!-- ====================================================== -->
-
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- lightweight="true"
- adaptable="true"
- label="%servletAnnotationDecorator"
- class="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator"
- state="true"
- location="TOP_LEFT"
- id="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet">
- <description>
- %servletAnnotationDecorator.description
- </description>
- <enablement>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.Servlet">
- </objectClass>
- </enablement>
- </decorator>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizard">
-
- <wizard-pages facet="jst.web" version="2.2">
- <install>
- <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.web" version="2.3">
- <install>
- <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.web" version="2.4">
- <install>
- <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image facet="jst.web" path="icons/war.gif"/>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties b/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
deleted file mode 100644
index 1fc98ab..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
+++ /dev/null
@@ -1,101 +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
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Dynamic Web Project
-_2=Servlet version:
-_3=Dynamic Web Project
-_4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.
-_5=Web project:
-_6=WAR file:
-_7=Import a WAR file from the file system
-_8=WAR Import
-_9=WAR Export
-_10=Export Web project to the local file system.
-_11=Context Root:
-_12=Convert Simple Web to Web Module
-_13=Convert Simple Web to Web Module.
-_14=WAR Import: Web libraries
-_15=Select the web library jars from the list below to be imported as web library projects. Unselected web libraries will be imported as jars in the WEB-INF/lib directory.
-_16=Select All
-_17=Deselect All
-
-ADD_SERVLET_WIZARD_WINDOW_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_DESC=Enter servlet deployment descriptor specific information.
-
-DEFAULT_PACKAGE=(default package)
-SELECT_CLASS_TITLE=Select Class
-MAP_CLASS_NAME_TO_CLASS_ERROR_MSG=IWAE0060E Could not uniquely map the class name to a class.
-EMPTY_LIST_MSG=Empty List
-ADD_LABEL=Add
-USE_EXISTING_SERVLET_CLASS=Use existing Servlet class
-INIT_PARAM_LABEL=Initialization Parameters:
-URL_MAPPINGS_LABEL=URL Mappings:
-CHOOSE_SERVLET_CLASS=Choose a servlet class
-
-NEW_SERVLET_WIZARD_WINDOW_TITLE=New Servlet
-NEW_SERVLET_WIZARD_PAGE_TITLE=Servlet
-NEW_SERVLET_WIZARD_PAGE_DESC=Create a new servlet.
-SERVLET_PACKAGE_LABEL=Java package:
-SERVLET_NAME_LABEL=Servlet name:
-
-ADD_BUTTON_LABEL=Add...
-REMOVE_BUTTON_LABEL=Remove
-URL_PATTERN_TITLE=URL Patterns
-URL_PATTERN_LABEL=Pattern:
-FOLDER_LABEL=Folder:
-JAVA_PACKAGE_LABEL=Java package:
-CLASS_NAME_LABEL=Class name:
-SUPERCLASS_LABEL=Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose the Web Content Folder or its subfolder
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-INTERFACE_SELECTION_DIALOG_DESC=Choose interfaces:
-INTERFACE_SELECTION_DIALOG_MSG_NONE=''{0}'' added.
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=Public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abstract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=Final
-JAVA_CLASS_INTERFACES_LABEL=Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=Inherited abstract methods
-JAVA_CLASS_BROWER_DIALOG_TITLE=Java Class Browser
-JAVA_CLASS_BROWER_DIALOG_MESSAGE=Browse for a Java class
-
-NAME_LABEL=Name
-DESCRIPTION_LABEL=Description
-VALUE_LABEL=Value
-BROWSE_BUTTON_LABEL=Browse...
-REMOVE_BUTTON=Remove
-
-NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.
-NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC=Specify modifiers, interfaces to implement, and method stubs to generate.
-
-ImportWARAction_UI_=Import Web Module...
-ExportWARAction_UI_=Export WAR file...
-
-NO_WEB_PROJECTS=No Web Projects
-
-SERVLETS =Servlets
-
-WEB_CONT_NAME = WebAppContainerPage
-WEB_CONT_PAGE_TITLE = Web App Libraries Container
-WEB_CONT_PAGE_DESCRIPTION = This container dynamically populates classpath entries from the WEB-INF/lib and WEB-INF/classes directories of a web app.
-WEB_CONT_PAGE_COMP_LABEL = Component:
-WEBCONTENT=Web Content folder:
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
deleted file mode 100644
index 0e7afb3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
+++ /dev/null
@@ -1,26 +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.jst.servlet.ui;
-
-public interface IWebUIContextIds {
-
- public static final String PLUGIN_SERVLET_UI = "org.eclipse.jst.servlet.ui."; //$NON-NLS-1$
-
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE1 = PLUGIN_SERVLET_UI + "webw1000"; //$NON-NLS-1$
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE2 = PLUGIN_SERVLET_UI + "webw1100"; //$NON-NLS-1$
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE3 = PLUGIN_SERVLET_UI + "webw1200"; //$NON-NLS-1$
-
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1 = PLUGIN_SERVLET_UI + "srvw1050"; //$NON-NLS-1$
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2 = PLUGIN_SERVLET_UI + "srvw1100"; //$NON-NLS-1$
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3 = PLUGIN_SERVLET_UI + "srvw1200"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
deleted file mode 100644
index 2474e61..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.actions;
-
-/*******************************************************************************
- * 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
- *******************************************************************************/
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-
-public class ConvertToWebModuleTypeAction extends AbstractOpenWizardWorkbenchAction {
-
- IStructuredSelection fSelection = null;
- IProject project = null;
- IWorkbenchWindow fWindow;
-
- /**
- * ConvertLinksDialog constructor comment.
- */
- public ConvertToWebModuleTypeAction() {
- super();
- }
-
- public ConvertToWebModuleTypeAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
- super(workbench, label, acceptedTypes, false);
- }
-
- protected Wizard createWizard() {
- //TODO: reimplement
-/* ConvertToWebComponentTypeWizard wizard = new ConvertToWebComponentTypeWizard(new ConvertWebProjectDataModel());
- WebComponentCreationDataModel model = (WebComponentCreationDataModel) wizard.getModel();
- model.setProperty(EditModelOperationDataModel.PROJECT_NAME, project.getName());
- model.setBooleanProperty(J2EEComponentCreationDataModel.ADD_TO_EAR, true);
-
- StaticWebNatureRuntime nature;
- try {
- nature = (StaticWebNatureRuntime) project.getNature(IWebNatureConstants.STATIC_NATURE_ID);
- String webContent = nature.getRootPublishableFolder().getName();
- String contextRoot = nature.getContextRoot();
- //model.setProperty(WebComponentCreationDataModel.WEB_CONTENT, webContent);
- model.setProperty(WebComponentCreationDataModel.CONTEXT_ROOT, contextRoot);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- Logger.getLogger().logError(e);
- }
-
- // wizard.setWindowTitle("Convert to Dynamic Web Project");
-
- return wizard;*/
- return null;
- }
-
- /**
- * make sure a web project is selected.
- */
- public boolean isValidProject(IProject aProject) {
- return J2EEProjectUtilities.isStaticWebProject(aProject);
- }
-
- /**
- * selectionChanged method comment.
- */
- public void selectionChanged(IAction action, ISelection selection) {
- boolean bEnable = false;
- if (selection instanceof IStructuredSelection) {
- fSelection = (IStructuredSelection) selection;
- bEnable = validateSelected(fSelection);
- }
- ((Action) action).setEnabled(bEnable);
- }
-
- /**
- * selectionChanged method comment.
- */
- public boolean validateSelected(ISelection selection) {
- if (!(selection instanceof IStructuredSelection))
- return false;
-
- fSelection = (IStructuredSelection) selection;
-
- Object selectedProject = fSelection.getFirstElement();
- if (!(selectedProject instanceof IProject))
- return false;
-
- project = (IProject) selectedProject;
- return isValidProject(project);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java
deleted file mode 100644
index d8ff4d8..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java
+++ /dev/null
@@ -1,51 +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.jst.servlet.ui.internal.actions;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class NewWebComponentAction extends AbstractOpenWizardWorkbenchAction {
-
- public static String LABEL = WEBUIMessages.WEB_MODULE_WIZ_TITLE;
- private static final String ICON = "war_wiz"; //$NON-NLS-1$
-
- public NewWebComponentAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewWebComponentAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
- super(workbench, label, activatedOnTypes, acceptEmptySelection);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewWebComponentAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
- super(workbench, label, acceptEmptySelection);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- protected Wizard createWizard() {
- return new WebProjectWizard();
- }
-
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }
- protected String getDialogText() {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
deleted file mode 100644
index aef4c0c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,34 +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.jst.servlet.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.jst.j2ee.internal.web.deployables.WebDeployableArtifactUtil;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class WebDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
-
- public IModuleArtifact getModuleArtifact(Object obj) {
- return WebDeployableArtifactUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
deleted file mode 100644
index 96cdfd4..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
+++ /dev/null
@@ -1,49 +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.jst.servlet.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- *
- */
-public class ServletUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.servlet.ui"; //$NON-NLS-1$
- // The shared instance.
- private static ServletUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public ServletUIPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static ServletUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
deleted file mode 100644
index 3477f07..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
+++ /dev/null
@@ -1,126 +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.jst.servlet.ui.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class WEBUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "web_ui";//$NON-NLS-1$
-
- private WEBUIMessages() {
- // Do not instantiate
- }
-
- public static String NEW_SERVLET_WIZARD_PAGE_TITLE;
- public static String FOLDER_LABEL;
- public static String URL_MAPPINGS_LABEL;
- public static String JAVA_CLASS_MODIFIERS_LABEL;
- public static String SUPERCLASS_LABEL;
- public static String WEB_CONT_PAGE_TITLE;
- public static String SERVLET_PACKAGE_LABEL;
- public static String PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public static String ADD_SERVLET_WIZARD_WINDOW_TITLE;
- public static String ADD_SERVLET_WIZARD_PAGE_TITLE;
- public static String JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public static String EMPTY_LIST_MSG;
- public static String ExportWARAction_UI_;
- public static String NO_WEB_PROJECTS;
- public static String INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public static String SUPERCLASS_SELECTION_DIALOG_TITLE;
- public static String PACKAGE_SELECTION_DIALOG_DESC;
- public static String JAVA_CLASS_BROWER_DIALOG_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public static String URL_PATTERN_LABEL;
- public static String CONTAINER_SELECTION_DIALOG_TITLE;
- public static String WEB_CONT_NAME;
- public static String URL_PATTERN_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public static String DESCRIPTION_LABEL;
- public static String USE_EXISTING_SERVLET_CLASS;
- public static String JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public static String INTERFACE_SELECTION_DIALOG_DESC;
- public static String ADD_LABEL;
- public static String ADD_SERVLET_WIZARD_PAGE_DESC;
- public static String SELECT_CLASS_TITLE;
- public static String JAVA_CLASS_BROWER_DIALOG_MESSAGE;
- public static String ImportWARAction_UI_;
- public static String _9;
- public static String JAVA_CLASS_METHOD_STUBS_LABEL;
- public static String _8;
- public static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public static String _7;
- public static String SERVLETS;
- public static String _6;
- public static String DEFAULT_PACKAGE;
- public static String _5;
- public static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
- public static String BROWSE_BUTTON_LABEL;
- public static String _4;
- public static String REMOVE_BUTTON;
- public static String _3;
- public static String _2;
- public static String _1;
- public static String INIT_PARAM_LABEL;
- public static String SERVLET_NAME_LABEL;
- public static String _0;
- public static String CLASS_NAME_LABEL;
- public static String _17;
- public static String _16;
- public static String JAVA_PACKAGE_LABEL;
- public static String _15;
- public static String _14;
- public static String _13;
- public static String PACKAGE_SELECTION_DIALOG_TITLE;
- public static String _12;
- public static String ADD_BUTTON_LABEL;
- public static String _11;
- public static String _10;
- public static String SUPERCLASS_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
- public static String REMOVE_BUTTON_LABEL;
- public static String NEW_SERVLET_WIZARD_WINDOW_TITLE;
- public static String INTERFACE_SELECTION_DIALOG_TITLE;
- public static String NAME_LABEL;
- public static String VALUE_LABEL;
- public static String WEB_CONT_PAGE_COMP_LABEL;
- public static String CHOOSE_SERVLET_CLASS;
- public static String NEW_SERVLET_WIZARD_PAGE_DESC;
- public static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public static String WEB_CONT_PAGE_DESCRIPTION;
- public static String JAVA_CLASS_INTERFACES_LABEL;
- public static String WEBCONTENT;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WEBUIMessages.class);
- }
-
- public static final String IMAGE_LOAD_ERROR = _0;
- public static final String WEB_MODULE_WIZ_TITLE = _1;
- public static final String WEB_VERSION_LBL = _2;
- public static final String WEB_PROJECT_MAIN_PG_TITLE = _3;
- public static final String WEB_PROJECT_MAIN_PG_DESC = _4;
- public static final String EJB_PROJECT_LBL = _5;
- public static final String WEB_FILE_LBL = _6;
- public static final String WEB_IMPORT_MAIN_PG_DESC = _7;
- public static final String WEB_IMPORT_MAIN_PG_TITLE = _8;
- public static final String WEB_EXPORT_MAIN_PG_TITLE = _9;
- public static final String WEB_EXPORT_MAIN_PG_DESC = _10;
- public static final String WEB_IMPORT_CONTEXT_ROOT = _11;
- public static final String WEB_CONVERT_MAIN_PG_DESC = _12;
- public static final String WEB_CONVERT_MAIN_PG_TITLE = _13;
- public static final String WEB_IMPORT_WEB_LIB_PG_TITLE = _14;
- public static final String WEB_IMPORT_WEB_LIB_PG_DESC = _15;
- public static final String WAR_IMPORT_SELECT_ALL_LIBS_BUTTON = _16;
- public static final String WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON = _17;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
deleted file mode 100644
index 24cfd6d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
+++ /dev/null
@@ -1,109 +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.jst.servlet.ui.internal.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New servlet wizard
- */
-public class AddServletWizard extends NewWebWizard {
- private static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
- private static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
- private static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
- /**
- * @param model
- */
- public AddServletWizard(IDataModel model) {
- super(model);
- setWindowTitle(IWebWizardConstants.ADD_SERVLET_WIZARD_WINDOW_TITLE);
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("newservlet_wiz")); //$NON-NLS-1$
- }
-
- public AddServletWizard() {
- this(null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
-
- NewServletClassWizardPage page1 = new NewServletClassWizardPage(
- getDataModel(),
- PAGE_ONE,
- IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE, J2EEProjectUtilities.DYNAMIC_WEB);
- page1.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1);
- addPage(page1);
- AddServletWizardPage page2 = new AddServletWizardPage(getDataModel(), PAGE_TWO);
- page2.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2);
- addPage(page2);
- NewServletClassOptionsWizardPage page3 = new NewServletClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE,
- IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3);
- addPage(page3);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return false;
- }
-
- public boolean canFinish() {
- return getDataModel().isValid();
- }
-
- protected void postPerformFinish() throws InvocationTargetException {
- //open new servlet class in java editor
- WebArtifactEdit artifactEdit = null;
- try {
- JavaClass javaClass = null;
- String className = getDataModel().getStringProperty(INewJavaClassDataModelProperties.QUALIFIED_CLASS_NAME);
- IProject p = (IProject) getDataModel().getProperty(INewJavaClassDataModelProperties.PROJECT);
- IVirtualComponent component = ComponentCore.createComponent(p);
- artifactEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
- ResourceSet resourceSet = artifactEdit.getDeploymentDescriptorResource().getResourceSet();
- javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(className,resourceSet);
- J2EEEditorUtility.openInEditor(javaClass, p );
- } catch (Exception cantOpen) {
- cantOpen.printStackTrace();
- } finally {
- if (artifactEdit!=null)
- artifactEdit.dispose();
- }
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new NewServletClassDataModelProvider();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
deleted file mode 100644
index c6163ac..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
+++ /dev/null
@@ -1,130 +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.jst.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Servlet Wizard Setting Page
- */
-public class AddServletWizardPage extends DataModelWizardPage {
- final static String[] JSPEXTENSIONS = {"jsp"}; //$NON-NLS-1$
-
- private Text displayNameText;
-
- private StringArrayTableWizardSection urlSection;
-
- public AddServletWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_DESC);
- this.setTitle(IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{INewServletClassDataModelProperties.DISPLAY_NAME, INewServletClassDataModelProperties.INIT_PARAM, INewServletClassDataModelProperties.URL_MAPPINGS};
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createNameDescription(composite);
- new StringArrayTableWizardSection(composite, IWebWizardConstants.INIT_PARAM_LABEL, IWebWizardConstants.ADD_BUTTON_LABEL,
- IWebWizardConstants.REMOVE_BUTTON_LABEL, new String[]{IWebWizardConstants.NAME_LABEL, IWebWizardConstants.VALUE_LABEL, IWebWizardConstants.DESCRIPTION_LABEL}, null,// WebPlugin.getDefault().getImage("initializ_parameter"),
- model, INewServletClassDataModelProperties.INIT_PARAM);
- urlSection = new StringArrayTableWizardSection(composite, IWebWizardConstants.URL_MAPPINGS_LABEL, IWebWizardConstants.ADD_BUTTON_LABEL, IWebWizardConstants.REMOVE_BUTTON_LABEL,
- new String[]{IWebWizardConstants.URL_PATTERN_LABEL}, null,// WebPlugin.getDefault().getImage("url_type"),
- model, INewServletClassDataModelProperties.URL_MAPPINGS);
- String text = displayNameText.getText();
- // Set default URL Pattern
- List input = new ArrayList();
- input.add(new String[]{"/" + text}); //$NON-NLS-1$
- if (urlSection != null)
- urlSection.setInput(input);
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME) == null || model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(IWebWizardConstants.NO_WEB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(IWebWizardConstants.NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- displayNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String text = displayNameText.getText();
- // Set default URL Pattern
- List input = new ArrayList();
- input.add(new String[]{"/" + text}); //$NON-NLS-1$
- if (urlSection != null)
- urlSection.setInput(input);
- }
-
- });
- synchHelper.synchText(displayNameText, INewServletClassDataModelProperties.DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(IWebWizardConstants.DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, INewServletClassDataModelProperties.DESCRIPTION, null);
- }
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
deleted file mode 100644
index 31c24fb..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
+++ /dev/null
@@ -1,68 +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.jst.servlet.ui.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.swt.graphics.Image;
-
-public class AvailableWebLibProvider implements IStructuredContentProvider, ITableLabelProvider {
-
- public AvailableWebLibProvider() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof WARFile) {
- Object[] array = ((WARFile) inputElement).getLibArchives().toArray();
- Arrays.sort(array, new Comparator() {
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
-
- });
- return array;
- }
- return new Object[0];
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- return AvailableJarsProvider.getUtilImage();
- }
-
- public String getColumnText(Object element, int columnIndex) {
- File file = (File) element;
- return file.getName();
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizard.java
deleted file mode 100644
index 40f2735..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizard.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/*******************************************************************************
- * 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
- *******************************************************************************/
-
-public class ConvertToWebComponentTypeWizard extends WebComponentCreationWizard {
-// private static final String ConvertToWebModuleTypeWizard = "org.eclipse.jst.servlet.ui.internal.wizard.convertWebProjectTypeWizard"; //$NON-NLS-1$
-
- public ConvertToWebComponentTypeWizard(IDataModel dataModel) {
- // TODO use flexible project
- //super(dataModel);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- //TODO use flexible project
- //addPage(new ConvertToWebModuleTypeWizardPage((WebModuleCreationDataModel) model, PAGE_ONE));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.web.ui.wizard.WEBProjectWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- */
- public void doInit(IWorkbench workbench, IStructuredSelection selection) {
- setWindowTitle(WEBUIMessages.WEB_CONVERT_MAIN_PG_TITLE); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizard#prePerformFinish()
- */
- protected boolean prePerformFinish() {
-/* IProjectDescription desc;
- try {
- //desc = ((WebComponentCreationDataModel) model).getTargetProject().getDescription();
- //desc.setBuildSpec(new ICommand[0]);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return super.prePerformFinish();*/
- return true;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizardPage.java
deleted file mode 100644
index 4277492..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizardPage.java
+++ /dev/null
@@ -1,40 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConvertToWebComponentTypeWizardPage extends WebComponentCreationWizardPage {
-
- /**
- * @param model
- * @param pageName
- */
- protected ConvertToWebComponentTypeWizardPage(IDataModel model, String pageName) {
- // TODO use flexible project
- //super(model, pageName);
- super(model, pageName);
- setDescription(WEBUIMessages.WEB_CONVERT_MAIN_PG_DESC); //$NON-NLS-1$
- setTitle(WEBUIMessages.WEB_CONVERT_MAIN_PG_TITLE); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.j2ee.ui.wizard.J2EEProjectCreationPage#createProjectNameGroup(org.eclipse.swt.widgets.Composite)
- */
- protected void createProjectNameGroup(Composite parent) {
- //super.createProjectNameGroup(parent);
- // projectNameGroup.projectNameField.setEnabled(false);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
deleted file mode 100644
index fceda44..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
+++ /dev/null
@@ -1,88 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-
-public interface IWebWizardConstants {
-
- // AddServletWizard
- public final static String ADD_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_WINDOW_TITLE;
- public final static String ADD_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_TITLE;
- public final static String ADD_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_DESC;
-
- public final static String DEFAULT_PACKAGE = WEBUIMessages.DEFAULT_PACKAGE;
- public final static String SELECT_CLASS_TITLE = WEBUIMessages.SELECT_CLASS_TITLE;
- public final static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG = WEBUIMessages.MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
- public final static String EMPTY_LIST_MSG = WEBUIMessages.EMPTY_LIST_MSG;
- public final static String ADD_LABEL = WEBUIMessages.ADD_LABEL;
- public final static String USE_EXISTING_SERVLET_CLASS = WEBUIMessages.USE_EXISTING_SERVLET_CLASS;
- public final static String INIT_PARAM_LABEL = WEBUIMessages.INIT_PARAM_LABEL;
- public final static String URL_MAPPINGS_LABEL = WEBUIMessages.URL_MAPPINGS_LABEL;
- public final static String CHOOSE_SERVLET_CLASS = WEBUIMessages.CHOOSE_SERVLET_CLASS;
-
- // NewServletWizard
- public final static String NEW_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_WINDOW_TITLE;
- public final static String NEW_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_TITLE;
- public final static String NEW_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_DESC;
- public final static String SERVLET_PACKAGE_LABEL = WEBUIMessages.SERVLET_PACKAGE_LABEL;
- public final static String SERVLET_NAME_LABEL = WEBUIMessages.SERVLET_NAME_LABEL;
-
-
- // common
- public final static String ADD_BUTTON_LABEL = WEBUIMessages.ADD_BUTTON_LABEL;
- public final static String REMOVE_BUTTON_LABEL = WEBUIMessages.REMOVE_BUTTON_LABEL;
- public final static String URL_PATTERN_TITLE = WEBUIMessages.URL_PATTERN_TITLE;
- public final static String URL_PATTERN_LABEL = WEBUIMessages.URL_PATTERN_LABEL;
- public final static String FOLDER_LABEL = WEBUIMessages.FOLDER_LABEL;
- public final static String JAVA_PACKAGE_LABEL = WEBUIMessages.JAVA_PACKAGE_LABEL;
- public final static String CLASS_NAME_LABEL = WEBUIMessages.CLASS_NAME_LABEL;
- public final static String SUPERCLASS_LABEL = WEBUIMessages.SUPERCLASS_LABEL;
- public final static String CONTAINER_SELECTION_DIALOG_TITLE = WEBUIMessages.CONTAINER_SELECTION_DIALOG_TITLE;
- public final static String CONTAINER_SELECTION_DIALOG_DESC = WEBUIMessages.CONTAINER_SELECTION_DIALOG_DESC;
- public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = WEBUIMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public final static String PACKAGE_SELECTION_DIALOG_TITLE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_TITLE;
- public final static String PACKAGE_SELECTION_DIALOG_DESC = WEBUIMessages.PACKAGE_SELECTION_DIALOG_DESC;
- public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_TITLE;
- public final static String SUPERCLASS_SELECTION_DIALOG_DESC = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_TITLE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_TITLE;
- public final static String INTERFACE_SELECTION_DIALOG_DESC = WEBUIMessages.INTERFACE_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public final static String JAVA_CLASS_MODIFIERS_LABEL = WEBUIMessages.JAVA_CLASS_MODIFIERS_LABEL;
- public final static String JAVA_CLASS_INTERFACES_LABEL = WEBUIMessages.JAVA_CLASS_INTERFACES_LABEL;
- public final static String JAVA_CLASS_METHOD_STUBS_LABEL = WEBUIMessages.JAVA_CLASS_METHOD_STUBS_LABEL;
- public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_BROWER_DIALOG_TITLE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_TITLE;
- public final static String JAVA_CLASS_BROWER_DIALOG_MESSAGE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_MESSAGE;
-
- public final static String NAME_LABEL = WEBUIMessages.NAME_LABEL;
- public final static String DESCRIPTION_LABEL = WEBUIMessages.DESCRIPTION_LABEL;
- public final static String VALUE_LABEL = WEBUIMessages.VALUE_LABEL;
- public final static String EMPTY_STRING = ""; //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL = WEBUIMessages.BROWSE_BUTTON_LABEL;
- public static final String REMOVE_BUTTON = WEBUIMessages.REMOVE_BUTTON;
-
- public final static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public final static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
- public final static String ImportWARAction_UI_ = WEBUIMessages.ImportWARAction_UI_;
- public final static String ExportWARAction_UI_ = WEBUIMessages.ExportWARAction_UI_;
-
- public final static String NO_WEB_PROJECTS = WEBUIMessages.NO_WEB_PROJECTS;
-
- public static final String SERVLETS = WEBUIMessages.SERVLETS;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
deleted file mode 100644
index 949ec11..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
+++ /dev/null
@@ -1,663 +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.jst.servlet.ui.internal.wizard;
-
-/**
- *
- */
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.jdt.internal.ui.util.StringMatcher;
-import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.FilteredFileSelectionDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.dialogs.TypedFileViewerFilter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- * @author: Administrator
- */
-public class MultiSelectFilteredFileSelectionDialog extends FilteredFileSelectionDialog implements SelectionListener {
-
-
- private static class PackageRenderer extends LabelProvider {
- private final Image PACKAGE_ICON = JavaPluginImages.get(JavaPluginImages.IMG_OBJS_PACKAGE);
-
- public String getText(Object element) {
- IType type = (IType) element;
- String p = type.getPackageFragment().getElementName();
- if ("".equals(p)) //$NON-NLS-1$
- p = IWebWizardConstants.DEFAULT_PACKAGE;
- return (p + " - " + type.getPackageFragment().getParent().getPath().toString()); //$NON-NLS-1$
- }
- public Image getImage(Object element) {
- return PACKAGE_ICON;
- }
- }
-
- private static class TypeRenderer extends LabelProvider {
- private final Image CLASS_ICON = JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CLASS);
-
- public String getText(Object element) {
- IType e = ((IType) element);
- return e.getElementName();
- }
-
- public Image getImage(Object element) {
- return CLASS_ICON;
- }
-
- }
- public final static int JSP = 0;
- public final static int SERVLET = 1;
- protected Button fServletButton;
- protected Button fJSPButton;
- protected int fSelection = -1;
- protected PageBook fPageBook = null;
- protected Control fJspControl = null;
- protected Control fServletControl = null;
- protected Composite fChild = null;
- // construction parameters
- protected IRunnableContext fRunnableContext;
- protected ILabelProvider fElementRenderer;
- protected ILabelProvider fQualifierRenderer;
- private Object[] fElements;
- private boolean fIgnoreCase = true;
- private String fUpperListLabel;
- private String fLowerListLabel;
- // SWT widgets
- private Table fUpperList;
- private Table fLowerList;
- protected Text fText;
- private IType[] fIT;
- private String[] fRenderedStrings;
- private int[] fElementMap;
- private Integer[] fQualifierMap;
-
- private ISelectionStatusValidator fLocalValidator = null;
- /**
- * MultiSelectFilteredFileSelectionDialog constructor comment.
- * @param parent Shell
- * @param title String
- * @param message String
- * @parent extensions String[]
- * @param allowMultiple boolean
- */
- public MultiSelectFilteredFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple, IProject project) {
- super(parent, title, message, extensions, allowMultiple);
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- if (title == null)
- setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
- if (message == null)
- message = WebAppEditResourceHandler.getString("Select_a_file__UI_"); //$NON-NLS-1$
- setMessage(message);
- setExtensions(extensions);
- addFilter(new TypedFileViewerFilter(extensions));
- fLocalValidator = new TypedElementSelectionValidator(new Class[] { IFile.class }, allowMultiple);
- setValidator(fLocalValidator);
- StatusInfo currStatus = new StatusInfo();
- currStatus.setOK();
- updateStatus(currStatus);
- fElementRenderer = new TypeRenderer();
- fQualifierRenderer = new PackageRenderer();
- fRunnableContext = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- try {
- IJavaElement jelem = null;
- IProject proj = null;
- jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
- if (jelem == null) {
- IResource resource = (IResource) project.getAdapter(IResource.class);
- if (resource != null) {
- proj = resource.getProject();
- if (proj != null) {
- jelem = org.eclipse.jdt.core.JavaCore.create(proj);
- }
- }
- }
- IJavaProject jp = jelem.getJavaProject();
-
- IType servletType = jp.findType("javax.servlet.Servlet"); //$NON-NLS-1$
- // next 3 lines fix defect 177686
- if (servletType == null) {
- return;
- }
-
- ArrayList servletClasses = new ArrayList();
- ITypeHierarchy tH = servletType.newTypeHierarchy(jp, null);
- IType[] types = tH.getAllSubtypes(servletType);
- for (int i = 0; i < types.length; i++) {
- if (types[i].isClass() && !servletClasses.contains(types[i]))
- servletClasses.add(types[i]);
- }
- fIT = (IType[]) servletClasses.toArray(new IType[servletClasses.size()]);
- servletClasses = null;
-
- } catch (Exception exc) {
- Logger.getLogger().logError(exc);
- }
- }
-
- /**
- * @private
- */
- protected void computeResult() {
- if (fSelection == JSP) {
- super.computeResult();
- } else {
- IType type = (IType) getWidgetSelection();
- if (type != null) {
- if (type == null) {
- String title = WebAppEditResourceHandler.getString("Select_Class_UI_"); //$NON-NLS-1$ = "Select Class"
- String message = WebAppEditResourceHandler.getString("Could_not_uniquely_map_the_ERROR_"); //$NON-NLS-1$ = "Could not uniquely map the class name to a class."
- MessageDialog.openError(getShell(), title, message);
- setResult(null);
- } else {
- java.util.List result = new ArrayList(1);
- result.add(type);
- setResult(result);
- }
- }
- }
- }
-
- public void create() {
- super.create();
- fText.setFocus();
- rematch(""); //$NON-NLS-1$
- updateOkState();
- }
-
- /**
- * Creates and returns the contents of this dialog's
- * button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
- * framework method to populate it. Subclasses may override.
- * </p>
- *
- * @param parent the parent composite to contain the button bar
- * @return the button bar control
- */
- protected Control createButtonBar(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
-
- layout.numColumns = 2;
-
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite2 = new Composite(composite, SWT.NONE);
-
- // create a layout with spacing and margins appropriate for the font size.
- layout = new GridLayout();
- layout.numColumns = 0; // this is incremented by createButton
- layout.makeColumnsEqualWidth = true;
- layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
- layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
- layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
- composite2.setLayout(layout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
- composite2.setLayoutData(data);
-
- composite2.setFont(parent.getFont());
-
- // Add the buttons to the button bar.
- super.createButtonsForButtonBar(composite2);
-
- return composite;
- }
-
- /*
- * @private
- */
- protected Control createDialogArea(Composite parent) {
- GridData gd = new GridData();
-
- fChild = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- fChild.setLayout(gl);
-
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessVerticalSpace = true;
- fChild.setLayoutData(gd);
-
- // Create the Web Type radio buttons and text fields.
- fServletButton = new Button(fChild, SWT.RADIO);
- fServletButton.setText(WebAppEditResourceHandler.getString("Servlet_UI_")); //$NON-NLS-1$ = Servlet
- gd = new GridData();
- fServletButton.setLayoutData(gd);
- fServletButton.addSelectionListener(this);
-
- fJSPButton = new Button(fChild, SWT.RADIO);
- fJSPButton.setText("JSP"); //$NON-NLS-1$
- gd = new GridData();
- fJSPButton.setLayoutData(gd);
- fJSPButton.addSelectionListener(this);
-
- if (fSelection == JSP)
- fJSPButton.setSelection(true);
- else {
- fServletButton.setSelection(true);
- fSelection = SERVLET;
- }
-
- fPageBook = new PageBook(fChild, SWT.NONE);
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = true;
- gd.horizontalSpan = 2;
- fPageBook.setLayoutData(gd);
- fJspControl = super.createDialogArea(fPageBook);
-
- Composite composite = new Composite(fPageBook, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- Label messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__1")); //$NON-NLS-1$
-
- fText = createText(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Matching_servlets__2")); //$NON-NLS-1$
-
- fUpperList = createUpperList(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Qualifier__3")); //$NON-NLS-1$
-
- fLowerList = createLowerList(composite);
-
- fServletControl = composite;
-
- if (fSelection == JSP)
- fPageBook.showPage(fJspControl);
- else
- fPageBook.showPage(fServletControl);
- return parent;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createLowerList(Composite parent) {
- if (fLowerListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fLowerListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fQualifierRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(5);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * Creates the text widget and sets layout data.
- * @return org.eclipse.swt.widgets.Text
- */
- private Text createText(Composite parent) {
- Text text = new Text(parent, SWT.BORDER);
- GridData spec = new GridData();
- spec.grabExcessVerticalSpace = false;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.BEGINNING;
- text.setLayoutData(spec);
- Listener l = new Listener() {
- public void handleEvent(Event evt) {
- rematch(fText.getText());
- }
- };
- text.addListener(SWT.Modify, l);
- return text;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createUpperList(Composite parent) {
- if (fUpperListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fElementRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(15);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * @return the ID of the button that is 'pressed' on doubleClick in the lists.
- * By default it is the OK button.
- * Override to change this setting.
- */
- protected int getDefaultButtonID() {
- return IDialogConstants.OK_ID;
- }
-
- public int getSelectedItem() {
- return fSelection;
- }
-
- protected Object getWidgetSelection() {
- int i = fLowerList.getSelectionIndex();
- if (fQualifierMap != null) {
- if (fQualifierMap.length == 1)
- i = 0;
- if (i < 0) {
- return null;
- }
- Integer index = fQualifierMap[i];
- return fElements[index.intValue()];
- }
- return null;
- }
-
- protected final void handleLowerDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleLowerSelectionChanged() {
- updateOkState();
- }
-
- protected final void handleUpperDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleUpperSelectionChanged() {
- int selection = fUpperList.getSelectionIndex();
- if (selection >= 0) {
- int i = fElementMap[selection];
- int k = i;
- int length = fRenderedStrings.length;
- while (k < length && fRenderedStrings[k].equals(fRenderedStrings[i])) {
- k++;
- }
- updateLowerListWidget(i, k);
- } else
- updateLowerListWidget(0, 0);
- }
-
- public int open() {
-
- if (fIT == null || fIT.length == 0) {
- MessageDialog.openInformation(getShell(), WebAppEditResourceHandler.getString("Empty_List_1"), WebAppEditResourceHandler.getString("_INFO_No_servlets_exist_to_add._1")); //$NON-NLS-2$ //$NON-NLS-1$
- return CANCEL;
- }
-
- setElements(fIT);
- setInitialSelection(""); //$NON-NLS-1$
- return super.open();
- }
-
- /**
- * update the list to reflect a new match string.
- * @param matchString java.lang.String
- */
- protected final void rematch(String matchString) {
- int k = 0;
- String text = fText.getText();
- StringMatcher matcher = new StringMatcher(text + "*", fIgnoreCase, false); //$NON-NLS-1$
- String lastString = null;
- int length = fElements.length;
- for (int i = 0; i < length; i++) {
- while (i < length && fRenderedStrings[i].equals(lastString))
- i++;
- if (i < length) {
- lastString = fRenderedStrings[i];
- if (matcher.match(fRenderedStrings[i])) {
- fElementMap[k] = i;
- k++;
- }
- }
- }
- fElementMap[k] = -1;
-
- updateUpperListWidget(fElementMap, k);
- }
-
- /**
- *
- * @return java.lang.String[]
- * @param p org.eclipse.jface.elements.IIndexedProperty
- */
- private String[] renderStrings(Object[] p) {
- String[] strings = new String[p.length];
- int size = strings.length;
- for (int i = 0; i < size; i++) {
- strings[i] = fElementRenderer.getText(p[i]);
- }
- new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
- return strings;
- }
-
- public void setElements(Object[] elements) {
- fElements = elements;
- fElementMap = new int[fElements.length + 1];
- fRenderedStrings = renderStrings(fElements);
- }
-
- public void setSelectedItem(int newSelection) {
- fSelection = newSelection;
- }
-
- private void updateLowerListWidget(int from, int to) {
- fLowerList.removeAll();
- fQualifierMap = new Integer[to - from];
- String[] qualifiers = new String[to - from];
- for (int i = from; i < to; i++) {
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- qualifiers[i - from] = fQualifierRenderer.getText(fElements[i]);
- fQualifierMap[i - from] = new Integer(i);
- }
-
- new TwoArrayQuickSorter(fIgnoreCase).sort(qualifiers, fQualifierMap);
-
- for (int i = 0; i < to - from; i++) {
- TableItem ti = new TableItem(fLowerList, i);
- ti.setText(qualifiers[i]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fQualifierRenderer.getImage(fElements[from + i]);
- if (img != null)
- ti.setImage(img);
- }
-
- if (fLowerList.getItemCount() > 0)
- fLowerList.setSelection(0);
- updateOkState();
- }
-
- private void updateOkState() {
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(getWidgetSelection() != null);
- }
-
- private void updateUpperListWidget(int[] indices, int size) {
- fUpperList.setRedraw(false);
- int itemCount = fUpperList.getItemCount();
- if (size < itemCount)
- fUpperList.remove(0, itemCount - size - 1);
- TableItem[] items = fUpperList.getItems();
- for (int i = 0; i < size; i++) {
- TableItem ti = null;
- if (i < itemCount)
- ti = items[i];
- else
- ti = new TableItem(fUpperList, i);
- ti.setText(fRenderedStrings[indices[i]]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fElementRenderer.getImage(fElements[indices[i]]);
- if (img != null)
- ti.setImage(img);
- }
- if (fUpperList.getItemCount() > 0)
- fUpperList.setSelection(0);
- fUpperList.setRedraw(true);
- handleUpperSelectionChanged();
- }
-
- /**
- * Sent when default selection occurs in the control.
- * <p>
- * For example, on some platforms default selection occurs
- * in a List when the user double-clicks an item or types
- * return in a Text.
- * </p>
- *
- * @param e an event containing information about the default selection
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
-
- /**
- * Sent when selection occurs in the control.
- * <p>
- * For example, on some platforms selection occurs in
- * a List when the user selects an item or items.
- * </p>
- *
- * @param e an event containing information about the selection
- */
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == fJSPButton) {
- fSelection = JSP;
- fPageBook.showPage(fJspControl);
- updateOKStatus();
- } else if (e.widget == fServletButton) {
- fSelection = SERVLET;
- fPageBook.showPage(fServletControl);
- } else
- fSelection = -1;
- }
-
- /**
- * @see ElementTreeSelectionDialog#updateOKStatus()
- */
- protected void updateOKStatus() {
- super.updateOKStatus();
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(fLocalValidator.validate(getResult()).isOK());
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
deleted file mode 100644
index c019b4a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
+++ /dev/null
@@ -1,123 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassOptionsWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- *
- */
-public class NewServletClassOptionsWizardPage extends NewJavaClassOptionsWizardPage {
- protected Button initButton;
- protected Button toStringButton;
- protected Button getInfoButton;
- protected Button doPostButton;
- protected Button doPutButton;
- protected Button doDeleteButton;
- protected Button destroyButton;
- protected Button doGetButton;
-
- public NewServletClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
- /**
- * Create the composite with all the stubs
- */
- protected void createStubsComposite(Composite parent) {
- Label stubLabel = new Label(parent, SWT.NONE);
- stubLabel.setText(IWebWizardConstants.JAVA_CLASS_METHOD_STUBS_LABEL);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- stubLabel.setLayoutData(data);
-
- Composite buttonCompo = new Composite(parent, SWT.NULL);
- buttonCompo.setLayout(new GridLayout());
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- data.horizontalIndent = 15;
- buttonCompo.setLayoutData(data);
-
- constructorButton = new Button(buttonCompo, SWT.CHECK);
- constructorButton.setText(IWebWizardConstants.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(constructorButton, INewJavaClassDataModelProperties.CONSTRUCTOR, null);
-
- inheritButton = new Button(buttonCompo, SWT.CHECK);
- inheritButton.setText(IWebWizardConstants.JAVA_CLASS_INHERIT_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(inheritButton, INewJavaClassDataModelProperties.ABSTRACT_METHODS, null);
- inheritButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- boolean enable = inheritButton.getSelection();
- initButton.setEnabled(enable);
- toStringButton.setEnabled(enable);
- getInfoButton.setEnabled(enable);
- doPostButton.setEnabled(enable);
- doPutButton.setEnabled(enable);
- doDeleteButton.setEnabled(enable);
- destroyButton.setEnabled(enable);
- doGetButton.setEnabled(enable);
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- //Do nothing
- }
- });
-
- Composite comp = new Composite(buttonCompo, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.makeColumnsEqualWidth = true;
- comp.setLayout(layout);
- data = new GridData(GridData.FILL_BOTH);
- comp.setLayoutData(data);
-
- initButton = new Button(comp, SWT.CHECK);
- initButton.setText("init"); //$NON-NLS-1$
- synchHelper.synchCheckbox(initButton, INewServletClassDataModelProperties.INIT, null);
-
- toStringButton = new Button(comp, SWT.CHECK);
- toStringButton.setText("toString"); //$NON-NLS-1$
- synchHelper.synchCheckbox(toStringButton, INewServletClassDataModelProperties.TO_STRING, null);
-
- getInfoButton = new Button(comp, SWT.CHECK);
- getInfoButton.setText("getServletInfo"); //$NON-NLS-1$
- synchHelper.synchCheckbox(getInfoButton, INewServletClassDataModelProperties.GET_SERVLET_INFO, null);
-
- doPostButton = new Button(comp, SWT.CHECK);
- doPostButton.setText("doPost"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doPostButton, INewServletClassDataModelProperties.DO_POST, null);
-
- doPutButton = new Button(comp, SWT.CHECK);
- doPutButton.setText("doPut"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doPutButton, INewServletClassDataModelProperties.DO_PUT, null);
-
- doDeleteButton = new Button(comp, SWT.CHECK);
- doDeleteButton.setText("doDelete"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doDeleteButton, INewServletClassDataModelProperties.DO_DELETE, null);
-
- destroyButton = new Button(comp, SWT.CHECK);
- destroyButton.setText("destroy"); //$NON-NLS-1$
- synchHelper.synchCheckbox(destroyButton, INewServletClassDataModelProperties.DESTROY, null);
-
- doGetButton = new Button(comp, SWT.CHECK);
- doGetButton.setText("doGet"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doGetButton, INewServletClassDataModelProperties.DO_GET, null);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
deleted file mode 100644
index 2e08889..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
+++ /dev/null
@@ -1,166 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewServletClassWizardPage extends NewJavaClassWizardPage {
-
- private AnnotationsStandaloneGroup annotationsGroup = null;
- private Button existingClassButton;
- private Label existingClassLabel;
- private Text existingClassText;
- private Button existingButton;
- private final static String[] JSPEXTENSIONS = { "jsp" }; //$NON-NLS-1$
-
-
- public NewServletClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- /**
- * Create annotations group and set default enablement
- */
- private void createAnnotationsGroup(Composite parent) {
- annotationsGroup = new AnnotationsStandaloneGroup(parent, model, J2EEProjectUtilities.EJB.equals(projectType),
- J2EEProjectUtilities.DYNAMIC_WEB.equals(projectType));
- if (!model.isPropertySet(IArtifactEditOperationDataModelProperties.PROJECT_NAME))
- return;
- IProject project = ProjectUtilities.getProject(model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
- annotationsGroup.setEnablement(project);
- // annotationsGroup.setUseAnnotations(true);
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
- addSeperator(composite,3);
- createUseExistingGroup(composite);
- createAnnotationsGroup(composite);
- return composite;
- }
-
- private void createUseExistingGroup(Composite composite) {
- existingButton = new Button(composite, SWT.CHECK);
- existingButton.setText(IWebWizardConstants.USE_EXISTING_SERVLET_CLASS);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 3;
- existingButton.setLayoutData(data);
- synchHelper.synchCheckbox(existingButton, INewServletClassDataModelProperties.USE_EXISTING_CLASS, null);
- existingButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleExistingButtonSelected();
- }
- });
-
- existingClassLabel = new Label(composite, SWT.LEFT);
- existingClassLabel.setText(IWebWizardConstants.CLASS_NAME_LABEL);
- existingClassLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- existingClassLabel.setEnabled(false);
-
- existingClassText = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- existingClassText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- existingClassText.setEnabled(false);
- synchHelper.synchText(existingClassText, INewJavaClassDataModelProperties.CLASS_NAME, null);
-
- existingClassButton = new Button(composite, SWT.PUSH);
- existingClassButton.setText(IWebWizardConstants.BROWSE_BUTTON_LABEL);
- existingClassButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- existingClassButton.setEnabled(false);
- existingClassButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleClassButtonSelected();
- }
- });
- }
-
- private void handleExistingButtonSelected() {
- boolean enable = existingButton.getSelection();
- if (!enable) {
- existingClassText.setText(""); //$NON-NLS-1$
- }
- existingClassLabel.setEnabled(enable);
- existingClassButton.setEnabled(enable);
- packageText.setEnabled(!enable);
- packageButton.setEnabled(!enable);
- packageLabel.setEnabled(!enable);
- classText.setEnabled(!enable);
- classText.setText(""); //$NON-NLS-1$
- classLabel.setEnabled(!enable);
- superText.setEnabled(!enable);
- superButton.setEnabled(!enable);
- superLabel.setEnabled(!enable);
- }
-
- private void handleClassButtonSelected() {
- getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
- IProject project = (IProject) model.getProperty(INewJavaClassDataModelProperties.PROJECT);
- IVirtualComponent component = ComponentCore.createComponent(project);
- MultiSelectFilteredFileSelectionDialog ms = new MultiSelectFilteredFileSelectionDialog(
- getShell(),
- IWebWizardConstants.NEW_SERVLET_WIZARD_WINDOW_TITLE,
- IWebWizardConstants.CHOOSE_SERVLET_CLASS,
- JSPEXTENSIONS,
- false,
- project);
- IContainer root = component.getRootFolder().getUnderlyingFolder();
- ms.setInput(root);
- ms.open();
- if (ms.getReturnCode() == Window.OK) {
- String qualifiedClassName = ""; //$NON-NLS-1$
- if (ms.getSelectedItem() == MultiSelectFilteredFileSelectionDialog.JSP) {
- Object obj = ms.getFirstResult();
- if (obj != null) {
- if (obj instanceof IFile) {
- IFile file = (IFile) obj;
- IPath pFull = file.getFullPath();
- IPath pBase = root.getFullPath();
- IPath path = pFull.removeFirstSegments(pBase.segmentCount());
- qualifiedClassName = path.makeAbsolute().toString();
- model.setProperty(INewServletClassDataModelProperties.IS_SERVLET_TYPE, new Boolean(false));
- }
- }
- }
- else {
- IType type = (IType) ms.getFirstResult();
- if (type != null) {
- qualifiedClassName = type.getFullyQualifiedName();
- model.setProperty(INewServletClassDataModelProperties.IS_SERVLET_TYPE, new Boolean(true));
- }
- }
- existingClassText.setText(qualifiedClassName);
- }
- getControl().setCursor(null);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
deleted file mode 100644
index 329ca11..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
+++ /dev/null
@@ -1,62 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * @author jlanuti
- */
-public abstract class NewWebWizard extends DataModelWizard implements INewWizard {
-
- /**
- * @param model
- */
- public NewWebWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * Default constructor
- */
- public NewWebWizard() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- getDataModel();
- }
-
- protected IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
- }
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java
deleted file mode 100644
index 5d448cf..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java
+++ /dev/null
@@ -1,99 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizard;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to create J2EE Web module structures in Eclipse Projects.
- * </p>
- * <p>
- * This wizard is not exposed as API to be extended.
- * </p>
- */
-
-/**
- * @deprecated
- * @see WebProjectWizard
- */
-public class WebComponentCreationWizard extends J2EEComponentCreationWizard implements IExecutableExtension, INewWizard {
-
- /**
- * <p>
- * The Wizard ID of the ConnectorModuleCreationWizard. Used for internal purposes and activities management.
- * </p>
- */
- public static final String WIZARD_ID = WebComponentCreationWizard.class.getName();
-
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public WebComponentCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public WebComponentCreationWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default page image.
- * </p>
- *
- */
- protected void doInit() {
- setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
- preFillSelectedEARProject();
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Adds a {@link JCAProjectCreationPage} as the {@link J2EEComponentCreationWizard#MAIN_PG}.
- * </p>
- */
- protected void doAddPages() {
- WebComponentCreationWizardPage page = new WebComponentCreationWizardPage(getDataModel(), MAIN_PG);
- page.setInfopopID("org.eclipse.jst.j2ee.ui.webw1000"); //$NON-NLS-1$
- addPage(page);
- super.doAddPages();
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new WebComponentCreationDataModelProvider();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java
deleted file mode 100644
index 88e831b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java
+++ /dev/null
@@ -1,109 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.DataModelAnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizardPage;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-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.common.frameworks.datamodel.IDataModel;
-
-/**
- *
- */
-public class WebComponentCreationWizardPage extends J2EEComponentCreationWizardPage implements IWebComponentCreationDataModelProperties{
-
- public Text contextRootNameField = null;
- public Label contextRootLabel = null;
- protected Text webFolderNameText = null;
-
- private static final int SIZING_TEXT_FIELD_WIDTH = 250;
- private DataModelAnnotationsStandaloneGroup annotationsGroup;
-
- /**
- * @param model
- * @param pageName
- */
- public WebComponentCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_PROJECT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_PROJECT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleCreationPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected void addToAdvancedComposite(Composite advanced) {
- super.addToAdvancedComposite(advanced);
- contextRootLabel = new Label(advanced, SWT.NULL);
- contextRootLabel.setText(WEBUIMessages.WEB_IMPORT_CONTEXT_ROOT);
- GridData data = new GridData();
- contextRootLabel.setLayoutData(data);
- // set up context root entry field
-
- contextRootNameField = new Text(advanced, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- contextRootNameField.setLayoutData(data);
- synchHelper.synchText(contextRootNameField, CONTEXT_ROOT, new Control[]{contextRootLabel});
-
- createSourceFolderComposite(advanced);
- createWebContentFolderComposite(advanced);
- createAnnotationsGroup(advanced);
- }
-
- protected void createWebContentFolderComposite(Composite parent) {
-
- Label label = new Label(parent, SWT.NONE);
- label.setText(WEBUIMessages.WEBCONTENT);
- GridData data = new GridData();
- label.setLayoutData(data);
- // set up project name entry field
- webFolderNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- webFolderNameText.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(webFolderNameText, WEBCONTENT_FOLDER, null);
- }
-
- private void createAnnotationsGroup(Composite parent) {
- annotationsGroup = new DataModelAnnotationsStandaloneGroup(parent, getDataModel(), false, synchHelper);
- }
- protected String[] getValidationPropertyNames() {
- String[] names = super.getValidationPropertyNames();
- String[] allNames = new String[names.length + 3];
- System.arraycopy(names, 0, allNames, 0, names.length);
- allNames[names.length] = CONTEXT_ROOT;
- allNames[names.length + 1] = IAnnotationsDataModel.USE_ANNOTATIONS;
- allNames[names.length + 2] = WEBCONTENT_FOLDER;
- return allNames;
- }
-
- public void dispose() {
- super.dispose();
- if (annotationsGroup != null)
- annotationsGroup.dispose();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
deleted file mode 100644
index 814ffe4..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
+++ /dev/null
@@ -1,65 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public WebComponentExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(WEBUIMessages.WEB_EXPORT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_EXPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.WEB_PROJ_LBL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- protected String[] getFilterExpression() {
- return new String[]{"*.war"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof org.eclipse.jst.j2ee.webapplication.WebApp;
- }
-
- protected String getCompnentID() {
- return "JST_WEB"; //$NON-NLS-1$
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
deleted file mode 100644
index 701660b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
+++ /dev/null
@@ -1,77 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Web Application module structures
- * from the Eclipse Workbench to a deployable Web Application
- * Archive *.war file.
- * </p>
- */
-public final class WebComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public WebComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public WebComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new WebComponentExportDataModelProvider();
- }
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li> {@link WebComponentExportPage} as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- public void doAddPages() {
- addPage(new WebComponentExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
deleted file mode 100644
index c762280..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
+++ /dev/null
@@ -1,63 +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
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportPage extends J2EEModuleImportPage {
- /**
- * @param model
- * @param pageName
- */
- public WebComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_IMPORT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_IMPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
-
- }
-
- protected String getFileImportLabel() {
- return WEBUIMessages.WEB_FILE_LBL;
- }
-
- protected String[] getFilterExpression() {
- return new String[]{"*.war"}; //$NON-NLS-1$
- }
-
- protected String getProjectImportLabel() {
- return WEBUIMessages.EJB_PROJECT_LBL;
- }
-
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- // TODO: implement with new import wizards
- // new AnnotationsStandaloneGroup(composite, getWebDataModel(), false);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
deleted file mode 100644
index a3a0857..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
+++ /dev/null
@@ -1,235 +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.jst.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEImportPage;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportWebLibsPage extends J2EEImportPage {
- private Button deselectAllButton;
- private Button selectAllButton;
- protected WARFile warFile;
- public CheckboxTableViewer availableJARsViewer;
- public boolean utilJarSelectionChanged = false;
-
- /**
- * @param model
- * @param pageName
- */
- public WebComponentImportWebLibsPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_TITLE);
- setDescription(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- createAvailableJarsList(composite);
- createButtonsGroup(composite);
- return composite;
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
- utilJarSelectionChanged = true;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gData.widthHint = 200;
- gData.heightHint = 80;
- availableJARsViewer.getControl().setLayoutData(gData);
- AvailableWebLibProvider libsProvider = new AvailableWebLibProvider();
- availableJARsViewer.setContentProvider(libsProvider);
- availableJARsViewer.setLabelProvider(libsProvider);
- availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- updateButtonEnablements();
- }
- });
- TableLayout tableLayout = new TableLayout();
- availableJARsViewer.getTable().setLayout(tableLayout);
- availableJARsViewer.getTable().setHeaderVisible(false);
- availableJARsViewer.getTable().setLinesVisible(false);
-
- model.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)) {
- availableJARsViewer.setCheckedElements(((List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)).toArray());
- }
- }
- });
- }
-
- private void handleDeselectAllButtonPressed() {
- ArrayList emptySelection = new ArrayList(2);
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, emptySelection);
- }
-
- private void handleSelectAllButtonPressed() {
- ArrayList allSelection = new ArrayList(2);
- Object selection = null;
- for (int i = 0; (null != (selection = availableJARsViewer.getElementAt(i))); i++) {
- allSelection.add(selection);
- }
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, allSelection);
- }
-
-
-
-
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(WEBUIMessages.WAR_IMPORT_SELECT_ALL_LIBS_BUTTON);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = 22;
- gd.widthHint = 120;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleSelectAllButtonPressed();
- }
- });
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(WEBUIMessages.WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- gd.heightHint = 22;
- gd.widthHint = 120;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleDeselectAllButtonPressed();
- }
- });
- }
-
-
-
-
-
- private void refreshEARFileIfNecessary() {
- if (isEARFileChanged()) {
- warFile = (WARFile) model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- refresh();
- }
- }
-
- protected void setJARsCompositeEnabled(boolean enabled) {
- availableJARsViewer.getTable().setEnabled(enabled);
- availableJARsViewer.setAllChecked(false);
- availableJARsViewer.setAllGrayed(!enabled);
- selectAllButton.setEnabled(enabled);
- deselectAllButton.setEnabled(enabled);
- }
-
- private void refresh() {
- availableJARsViewer.setInput(warFile);
- }
-
- public boolean isEARFileChanged() {
- return warFile != model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
- }
-
- protected void enter() {
- super.enter();
- refreshEARFileIfNecessary();
- }
-
- public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, getJARsForProjects());
- validatePage();
- }
-
- public List getJARsForProjects() {
- refreshEARFileIfNecessary();
- List result = new ArrayList();
- result.addAll(Arrays.asList(availableJARsViewer.getCheckedElements()));
- return result;
- }
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{};
- }
-
- protected void restoreWidgetValues() {
- // This page doesn't implement...
- }
-
- public void storeDefaultSettings() {
- // This page doesn't implement...
- }
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
deleted file mode 100644
index 60ab7c7..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
+++ /dev/null
@@ -1,94 +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.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to import J2EE Web Application module structures into the Eclipse Workbench from an
- * existing Web Application *.war file.
- * </p>
- */
-public final class WebComponentImportWizard extends J2EEComponentImportWizard {
-
- protected static final String WEB_LIBS_PG = "WEB_LIBS_PG"; //$NON-NLS-1$
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public WebComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public WebComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds an {@link WARImportPage} as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- public void doAddPages() {
- addPage(new WebComponentImportPage(getDataModel(), MAIN_PG));
- addPage(new WebComponentImportWebLibsPage(getDataModel(), WEB_LIBS_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- // updateEARToModelFromSelection(getSpecificDataModel());
- }
-
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator"}; //$NON-NLS-1$
- }
-
-
- // protected String getFinalPerspectiveID() {
- // // J2EEComponentCreationDataModel projCreationModel =
- // // getSpecificDataModel().getJ2EEModuleCreationDataModel();
- // // return projCreationModel.getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
- // return getDataModel().getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
- // }
-
- protected IDataModelProvider getDefaultProvider() {
- return new WebComponentImportDataModelProvider();
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
deleted file mode 100644
index 1150a83..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
+++ /dev/null
@@ -1,98 +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.jst.servlet.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.osgi.util.NLS;
-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;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public final class WebFacetInstallPage extends J2EEModuleFacetInstallPage implements IWebFacetInstallDataModelProperties {
- private Label contextRootLabel;
- private Text contextRoot;
- private Label contentDirLabel;
- private Text contentDir;
- private Text sourceDir;
- private Label sourceDirLabel;
-
- public WebFacetInstallPage() {
- super("web.facet.install.page"); //$NON-NLS-1$
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- }
-
- protected Composite createTopLevelComposite(final Composite parent) {
- setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- //setupEarControl(composite);
-
- this.contextRootLabel = new Label(composite, SWT.NONE);
- this.contextRootLabel.setText(Resources.contextRootLabel);
- 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});
-
- this.contentDirLabel = new Label(composite, SWT.NONE);
- this.contentDirLabel.setText(Resources.contentDirLabel);
- this.contentDirLabel.setLayoutData(gdhfill());
-
- this.contentDir = new Text(composite, SWT.BORDER);
- this.contentDir.setLayoutData(gdhfill());
- this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$
- synchHelper.synchText(contentDir, CONFIG_FOLDER, null);
-
- this.sourceDirLabel = new Label(composite, SWT.NONE);
- this.sourceDirLabel.setText(Resources.sourceDirLabel);
- this.sourceDirLabel.setLayoutData(gdhfill());
-
- this.sourceDir = new Text(composite, SWT.BORDER);
- this.sourceDir.setLayoutData(gdhfill());
- this.sourceDir.setData("label", this.sourceDirLabel); //$NON-NLS-1$
- synchHelper.synchText(sourceDir, SOURCE_FOLDER, null);
-
- return composite;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME, CONTEXT_ROOT, CONFIG_FOLDER, SOURCE_FOLDER};
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
- public static String contextRootLabel;
- public static String contextRootLabelInvalid;
- public static String contentDirLabel;
- public static String contentDirLabelInvalid;
- public static String sourceDirLabel;
-
- static {
- initializeMessages(WebFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
deleted file mode 100644
index 997fa4d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-pageTitle = Web Module
-pageDescription = Configure web module settings.
-contextRootLabel = Context Root:
-contextRootLabelInvalid = Context Root (invalid):
-contentDirLabel = Content Directory:
-contentDirLabelInvalid = Content Directory (invalid):
-sourceDirLabel = Java Source Directory:
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
deleted file mode 100644
index 65f32ce..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.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.jst.servlet.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public WebProjectFirstPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_PROJECT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_PROJECT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
- setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE1);
- }
-
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
deleted file mode 100644
index 6596678..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
+++ /dev/null
@@ -1,56 +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.jst.servlet.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-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.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class WebProjectWizard extends NewProjectDataModelFacetWizard {
-
- public WebProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
- }
-
- public WebProjectWizard() {
- super();
- setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
- }
-
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- }
-
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.web"); //$NON-NLS-1$
- }
-
- protected IWizardPage createFirstPage() {
- return new WebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.servlet.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/full/ctool16/web-wiz-banner.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-}
diff --git a/plugins/org.eclipse.wst.web.ui/.classpath b/plugins/org.eclipse.wst.web.ui/.classpath
deleted file mode 100644
index 36456d4..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"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web.ui/.cvsignore b/plugins/org.eclipse.wst.web.ui/.cvsignore
deleted file mode 100644
index fedbeef..0000000
--- a/plugins/org.eclipse.wst.web.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
-uisrc.zip
-@dot
-src.zip
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/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e105363..0000000
--- a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Simple Web UI Plug-in
-Bundle-SymbolicName: org.eclipse.wst.web.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.web.ui.internal.WSTWebUIPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.web.ui.internal,
- org.eclipse.wst.web.ui.internal.wizards
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.web,
- org.eclipse.jem.util,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.server.ui,
- org.eclipse.emf.ecore
-Eclipse-AutoStart: true
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 6f6b96c..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
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 2b7383e..0000000
--- a/plugins/org.eclipse.wst.web.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- .
-jars.compile.order = .
-source.. = static_web_ui/
-output.. = bin/
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/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.gif b/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 57c68b3..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.gif
+++ /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 3d7c8e3..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
-
-
-
-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
\ 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 78e53f7..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.xml
+++ /dev/null
@@ -1,103 +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"
- id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard">
- <description>
- %StaticWebProject.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension> -->
- <!-- add in the features page
- <extension
- id="corg.eclipse.wst.web.ui.internal.wizards.WebProjectFeaturesWizardPage"
- name="%WebProjectFeatures.name"
- point="org.eclipse.wst.common.frameworks.ui.wizardPageGroup">
- <wizardPageGroup
- pageGroupID="org.eclipse.wst.web.ui.internal.wizards.WebProjectFeaturesWizardPage"
- wizardID="com.ibm.etools.webtools.StaticWebProjectCreation">
- <factory
- className="org.eclipse.wst.web.ui.internal.wizards.WebProjectFeaturesWizardPageFactory">
- </factory>
- </wizardPageGroup>
- </extension>
- -->
- <!-- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- name="%StaticWebSettings"
- class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebSettingsPropertiesPage"
- id="StaticWebSettingsPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.web.StaticWebNature">
- </filter>
- </page>
-
- <page
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- name="%WebProjectFeatures.name"
- class="com.ibm.itp.wt.ui.WebFeaturesPropertiesPage"
- id="WebFeaturesPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.web.StaticWebNature">
- </filter>
- </page>
- </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="com.ibm.wtp.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.wizard">
- <wizard-pages facet="wst.web" version="1.0">
- <install>
- <page class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebFacetInstallPage"/>
- </install>
- </wizard-pages>
- </extension>
-</plugin>
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 84b5514..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/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.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 c801197..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
+++ /dev/null
@@ -1,94 +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.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.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebUIPlugin extends AbstractUIPlugin {
- // 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
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key, getBundle());
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- 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.getLogger().logWarning("Load_Image_Error_"); //$NON-NLS-1$
- exception.printStackTrace();
- continue;
- }
- }
- return null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static WSTWebUIPlugin getDefault() {
- return plugin;
- }
-
-}
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 27880dc..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java
+++ /dev/null
@@ -1,158 +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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-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.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-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.runtime.IRuntime;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-import org.eclipse.wst.web.internal.ResourceHandler;
-
-public class DataModelFacetCreationWizardPage extends DataModelWizardPage implements IFacetProjectCreationDataModelProperties {
-
- private static final String LAST_RUNTIME_STORE = "LAST_RUNTIME"; //$NON-NLS-1$
-
-
- protected static GridData gdhfill() {
- return new GridData(GridData.FILL_HORIZONTAL);
- }
-
- 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);
- Composite composite = new Composite(top, SWT.NONE);
- composite.setLayoutData(gdhfill());
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createServerTargetComposite(composite);
- return top;
- }
-
- public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
- DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(FACET_RUNTIME);
- boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (isOK && model != null) {
-
- 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 = ProjectUtilities.getNewObject(preAddition, postAddition);
-
- model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
- if (newAddition != null)
- model.setProperty(FACET_RUNTIME, newAddition);
- else
- return false;
- }
- return isOK;
- }
-
- protected Combo serverTargetCombo;
- protected NewProjectGroup projectNameGroup;
-
- public DataModelFacetCreationWizardPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- }
-
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(ResourceHandler.TargetRuntime);
- serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- serverTargetCombo.setLayoutData(gdhfill());
- Button newServerTargetButton = new Button(parent, SWT.NONE);
- newServerTargetButton.setText(ResourceHandler.NewDotDotDot);
- newServerTargetButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (!launchNewRuntimeWizard(getShell(), model)) {
- setErrorMessage(ResourceHandler.InvalidServerTarget);
- }
- }
- });
- Control[] deps = new Control[]{label, 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);
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{IProjectCreationPropertiesNew.PROJECT_NAME, IProjectCreationPropertiesNew.PROJECT_LOCATION, FACET_RUNTIME};
- }
-
- public void dispose() {
- super.dispose();
- if (projectNameGroup != null)
- projectNameGroup.dispose();
- }
-
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- IRuntime runtime = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- String runtimeName = runtime == null ? "" : runtime.getName(); //$NON-NLS-1$
- settings.put(LAST_RUNTIME_STORE, runtimeName);
- }
- }
-
- public void restoreDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- if (!model.isPropertySet(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)) {
- boolean runtimeSet = false;
- String lastRuntimeName = settings.get(LAST_RUNTIME_STORE);
- DataModelPropertyDescriptor[] descriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- if (lastRuntimeName != null) {
- for (int i = 0; i < descriptors.length && !runtimeSet; i++) {
- if (lastRuntimeName.equals(descriptors[i].getPropertyDescription())) {
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[i].getPropertyValue());
- runtimeSet = true;
- }
- }
- }
- if (!runtimeSet && descriptors.length > 0) {
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[0].getPropertyValue());
- }
- }
- }
- }
-}
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/IProductConstants.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IProductConstants.java
deleted file mode 100644
index 014853d..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IProductConstants.java
+++ /dev/null
@@ -1,45 +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.wizards;
-
-/**
- * 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.
- *
- * @see org.eclipse.core.runtime.IProduct#getProperty(String)
- */
-
-public interface IProductConstants
-{
- /**
- * <p>Alters the final perspective used by the following new project
- * wizards:</p>
- *
- * <ul>
- * <li>EJB -> EJB Project</li>
- * <li>J2EE -> Application Client Project</li>
- * <li>J2EE -> Connector Project</li>
- * <li>J2EE -> Enterprise Application Project</li>
- * <li>J2EE -> Utility Project</li>
- * <li>Web -> Dynamic Web Project</li>
- * <li>Web -> Static Web Project</li>
- * </ul>
- *
- * The default value is: org.eclipse.jst.j2ee.J2EEPerspective.
- */
-
- public static final String FINAL_PERSPECTIVE
- = "j2eeNewProjectFinalPerspective"; //$NON-NLS-1$
-}
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 bb98c49..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java
+++ /dev/null
@@ -1,11 +0,0 @@
-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 2ce34a4..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
+++ /dev/null
@@ -1,378 +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 java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProduct;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-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.componentcore.internal.operation.FacetProjectCreationOperation;
-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.internal.datamodel.ui.DataModelWizardPage;
-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.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action.Type;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.ui.AddRemoveFacetsWizard;
-import org.eclipse.wst.common.project.facet.ui.internal.ConflictingFacetsFilter;
-import org.eclipse.wst.common.project.facet.ui.internal.FacetsSelectionPanel;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public abstract class NewProjectDataModelFacetWizard extends AddRemoveFacetsWizard implements INewWizard, IFacetProjectCreationDataModelProperties {
-
- protected IDataModel model = null;
- private final IFacetedProjectTemplate template;
- private IWizardPage firstPage;
- private IConfigurationElement configurationElement;
-
- public NewProjectDataModelFacetWizard(IDataModel model) {
- super(null);
- this.model = model;
- template = getTemplate();
- this.setDefaultPageImageDescriptor(getDefaultPageImageDescriptor());
- }
-
- public NewProjectDataModelFacetWizard() {
- super(null);
- model = createDataModel();
- template = getTemplate();
- this.setDefaultPageImageDescriptor(getDefaultPageImageDescriptor());
- }
-
- public IDataModel getDataModel() {
- return model;
- }
-
- protected abstract IDataModel createDataModel();
-
- protected abstract ImageDescriptor getDefaultPageImageDescriptor();
-
- protected abstract IFacetedProjectTemplate getTemplate();
-
- protected abstract IWizardPage createFirstPage();
-
- public void addPages() {
- firstPage = createFirstPage();
- addPage(firstPage);
-
- super.addPages();
- final Set fixed = this.template.getFixedProjectFacets();
-
- this.facetsSelectionPage.setFixedProjectFacets(fixed);
-
- this.facetsSelectionPage.addSelectedFacetsChangedListener(new Listener() {
- public void handleEvent(Event event) {
- facetSelectionChangedEvent(event);
- }
- });
-
- // Disabling this as it interfers with the facet selection based on the
- // runtime.
-
- /*
- * Set facetVersions = new HashSet(); FacetDataModelMap map = (FacetDataModelMap)
- * model.getProperty(FACET_DM_MAP); for (Iterator iterator = map.values().iterator();
- * iterator.hasNext();) { IDataModel model = (IDataModel) iterator.next();
- * facetVersions.add(model.getProperty(IFacetDataModelProperties.FACET_VERSION)); }
- * this.facetsSelectionPage.setInitialSelection(facetVersions);
- */
-
-
- final ConflictingFacetsFilter filter = new ConflictingFacetsFilter(fixed);
-
- this.facetsSelectionPage.setFilters(new FacetsSelectionPanel.IFilter[]{filter});
-
- IRuntime runtime = (IRuntime) model.getProperty(FACET_RUNTIME);
- if (runtime != null)
- setRuntime(runtime);
- synchRuntimes();
- }
-
- public IWizardPage[] getPages() {
- final IWizardPage[] base = super.getPages();
- final IWizardPage[] pages = new IWizardPage[base.length + 1];
-
- pages[0] = this.firstPage;
- System.arraycopy(base, 0, pages, 1, base.length);
-
- return pages;
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- }
-
- protected void synchRuntimes() {
- 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())) {
- IRuntime runtime = (IRuntime) event.getProperty();
- if (runtime != getRuntime()) {
- setRuntime(runtime);
- }
- }
- }
- }
- });
-
- addRuntimeListener(new Listener() {
- public void handleEvent(final Event event) {
- model.setProperty(FACET_RUNTIME, getRuntime());
- }
- });
- }
-
- public String getProjectName() {
- return model.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
- }
-
- public boolean performFinish()
- {
- if( super.performFinish() == false )
- {
- return false;
- }
-
- try {
- postPerformFinish();
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- }
-
- return true;
- }
-
- protected void performFinish(final IProgressMonitor monitor)
-
- throws CoreException
-
- {
- monitor.beginTask("", 10);
-
- storeDefaultSettings();
- try {
- FacetProjectCreationOperation operation = new FacetProjectCreationOperation(model);
- this.fproj = operation.createProject(new SubProgressMonitor(monitor, 2));
-
- super.performFinish(new SubProgressMonitor(monitor, 8));
-
- final Set fixed = this.template.getFixedProjectFacets();
- this.fproj.setFixedProjectFacets(fixed);
- } finally {
- monitor.done();
- }
- }
-
- /**
- * <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 the J2EE 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()
- {
- final IProduct product = Platform.getProduct();
- String perspective = null;
- if (product != null)
- perspective = product.getProperty( IProductConstants.FINAL_PERSPECTIVE );
- if(perspective == null)
- perspective = "org.eclipse.jst.j2ee.J2EEPerspective"; //$NON-NLS-1$
- return perspective;
- }
-
- /**
- * {@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().getDeclaringPluginDescriptor().getUniqueIdentifier() : ""; //$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 {
-
- if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
-
- IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
- 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);
- String projName = getProjectName();
- BasicNewResourceWizard.selectAndReveal(ProjectUtilities.getProject(projName), WSTWebUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());
- }
-
- /**
- * 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
- *
- * @param event
- */
- protected void facetSelectionChangedEvent(Event event) {
- Set actions = this.facetsSelectionPage.getActions();
- 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);
- }
-
- public Object getConfig(IProjectFacetVersion fv, Type type, String pjname) throws CoreException {
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
- IDataModel configDM = (IDataModel) map.get(fv.getProjectFacet().getId());
- if (configDM == null) {
- final Object config = fv.createActionConfig(type, pjname);
- if (config == null || !(config instanceof IDataModel))
- return null;
- configDM = (IDataModel) config;
- map.add(configDM);
- }
- configDM.setProperty(IFacetDataModelProperties.FACET_VERSION, fv);
- return configDM;
- }
-
- 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();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java
deleted file mode 100644
index 73d857e..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java
+++ /dev/null
@@ -1,117 +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.ui.internal.wizards;
-
-import java.util.Vector;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.WebPropertiesUtil;
-
-public class SimpleContextRootComposite extends Composite {
- protected Text contextRootField;
- private String errorMessage = null;
-
- // listeners interested in the event when the context root
- // value is modified.
- private java.util.List modifyListeners;
-
- protected Listener contextRootModifyListener = new Listener() {
- public void handleEvent(Event e) {
- if (contextRootField != null)
- contextRootModified();
- }
- };
-
- public SimpleContextRootComposite(Composite parent) {
- super(parent, SWT.NONE);
- createControls();
- modifyListeners = new Vector(1);
- }
-
- protected void createControls() {
- // container specification group
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- setLayout(layout);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- data.horizontalSpan = 2;
- setLayoutData(data);
-
- // New Context Root Label
- Label contextRootLabel = new Label(this, SWT.CHECK);
- contextRootLabel.setText(ResourceHandler.StaticContextRootComposite_Context_Root_Label);
-
- // New Context Root Entryfield
- contextRootField = new Text(this, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
- data.grabExcessHorizontalSpace = true;
- contextRootField.setLayoutData(data);
-
- contextRootField.addListener(SWT.Modify, contextRootModifyListener);
-
- }
-
- public String getContextRoot() {
- return contextRootField.getText();
- }
-
- public void setEnabled(boolean enabled) {
- if (contextRootField != null)
- contextRootField.setEnabled(enabled);
- }
-
- protected void contextRootModified() {
- errorMessage = WebPropertiesUtil.validateContextRoot(getContextRoot());
- // notify listeners
- Event e = new Event();
- e.type = SWT.Modify;
- e.widget = contextRootField;
- for (int i = 0; i < modifyListeners.size(); i++) {
- ((Listener) modifyListeners.get(i)).handleEvent(e);
- }
- }
-
- public void setContextRoot(String cr) {
- contextRootField.setText(cr);
- }
-
- /**
- * There is a default context root validation listener provided by the
- * composite, adding external listeners will replace the default listener.
- */
- public void addModifyListener(Listener l) {
- modifyListeners.add(l);
- }
-
- public void removeModifyListener(Listener l) {
- modifyListeners.remove(l);
- }
-
- /**
- * validate the context root value and return the error message
- */
- public String getErrorMessage() {
- return errorMessage;
- }
-
- public boolean setFocus() {
- return contextRootField.setFocus();
- }
-}
\ No newline at end of file
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 6d9f28c..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.wst.web.ui.internal.wizards;
-
-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);
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{CONTENT_DIR};
- }
-
- 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);
-
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java
deleted file mode 100644
index fd27c5a..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java
+++ /dev/null
@@ -1,67 +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.ui.internal.wizards;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public class SimpleWebModuleCreationWizard extends DataModelWizard implements IExecutableExtension, INewWizard {
-
- public SimpleWebModuleCreationWizard(IDataModel model) {
- super(model);
- }
-
- public SimpleWebModuleCreationWizard() {
- super();
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new SimpleWebModuleCreationDataModelProvider();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- addPage(new SimpleWebModuleWizardBasePage(getDataModel(), "page1")); //$NON-NLS-1$
- }
-
- public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title);
- setDefaultPageImageDescriptor(WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz")); //$NON-NLS-1$
- }
-
-// protected void postPerformFinish() throws InvocationTargetException {
-// IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
-//
-// IWizardDescriptor descriptor = newWizardRegistry.findWizard(getWizardID());
-//
-// if(descriptor instanceof WorkbenchWizardElement)
-// BasicNewProjectResourceWizard.updatePerspective(((WorkbenchWizardElement)descriptor).getConfigurationElement());
-// IWorkbenchWindow window = WSTWebPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-// IProject project = ((SimpleWebModuleCreationDataModel) model).getTargetProject();
-// BasicNewResourceWizard.selectAndReveal(project, window);
-// }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java
deleted file mode 100644
index 9b3e972..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java
+++ /dev/null
@@ -1,167 +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.ui.internal.wizards;
-
-import java.io.File;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-import org.eclipse.wst.web.internal.operation.ISimpleWebModuleCreationDataModelProperties;
-
-class SimpleWebModuleWizardBasePage extends DataModelWizardPage implements ISimpleWebModuleCreationDataModelProperties{
- public Text projectNameField = null;
- protected Text locationPathField = null;
- protected Button browseButton = null;
- // constants
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- // default values
- private String defProjectNameLabel = WTPCommonUIResourceHandler.Name_; //$NON-NLS-1$
- private String defBrowseButtonLabel = WTPCommonUIResourceHandler.Browse_;//$NON-NLS-1$
- private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
- public SimpleWebModuleWizardBasePage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setDescription(ResourceHandler.StaticWebProjectWizardBasePage_Page_Description);
- setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title);
- ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(WSTWebPlugin.PLUGIN_ID, "icons/full/wizban/newwprj_wiz.gif"); //$NON-NLS-1$
- setImageDescriptor(desc);
- setPageComplete(false);
- }
-
- protected void setSize(Composite composite) {
- if (composite != null) {
- Point minSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- composite.setSize(minSize);
- // set scrollbar composite's min size so page is expandable but has
- // scrollbars when needed
- if (composite.getParent() instanceof ScrolledComposite) {
- ScrolledComposite sc1 = (ScrolledComposite) composite.getParent();
- sc1.setMinSize(minSize);
- sc1.setExpandHorizontal(true);
- sc1.setExpandVertical(true);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{PROJECT_NAME};
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite top = new Composite(parent, SWT.NONE);
- top.setLayout(new GridLayout());
- top.setData(new GridData(GridData.FILL_BOTH));
- Composite composite = new Composite(top, SWT.NONE);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- buildComposites(composite);
- Composite detail = new Composite(top, SWT.NONE);
- detail.setLayout(new GridLayout());
- detail.setData(new GridData(GridData.FILL_BOTH));
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp(top, "com.ibm.etools.webtools.wizards.basic.webw1450"); //$NON-NLS-1$
- return top;
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createProjectNameGroup(parent);
- createProjectLocationGroup(parent);
- projectNameField.setFocus();
- }
-
- private void createProjectLocationGroup(Composite parent) {
- // set up location path label
- Label locationPathLabel = new Label(parent, SWT.NONE);
- locationPathLabel.setText(WTPCommonUIResourceHandler.Project_location_);//$NON-NLS-1$
- GridData data = new GridData();
- locationPathLabel.setLayoutData(data);
- // set up location path entry field
- locationPathField = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- locationPathField.setLayoutData(data);
- // set up browse button
- browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleLocationBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
- synchHelper.synchText(locationPathField, LOCATION, null);
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleLocationBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
- dialog.setMessage(defDirDialogLabel);
- String dirName = model.getStringProperty(LOCATION);
- if ((dirName != null) && (dirName.length() != 0)) {
- File path = new File(dirName);
- if (path.exists()) {
- dialog.setFilterPath(dirName);
- }
- }
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- model.setProperty(LOCATION, selectedDirectory);
- }
- }
-
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(defProjectNameLabel);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameField = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- projectNameField.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(projectNameField, PROJECT_NAME, new Control[]{projectNameLabel});
- }
-}
\ No newline at end of file
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 fc43062..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.wst.web.ui.internal.wizards;
-
-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);
- }
-
-}
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 3184a38..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-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.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);
- }
-
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());
- }
-
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- return WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz"); //$NON-NLS-1$
- }
-
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.wst.web"); //$NON-NLS-1$
- }
-
- protected IWizardPage createFirstPage() {
- return new SimpleWebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/.classpath b/plugins/org.eclipse.wst.web/.classpath
deleted file mode 100644
index 2195e24..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"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web/.cvsignore b/plugins/org.eclipse.wst.web/.cvsignore
deleted file mode 100644
index c57b639..0000000
--- a/plugins/org.eclipse.wst.web/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
-@dot
-src.zip
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/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
deleted file mode 100644
index 6ef1ef2..0000000
--- a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Simple Web Plug-in
-Bundle-SymbolicName: org.eclipse.wst.web; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.web.internal.WSTWebPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.wst.project.facet,
- org.eclipse.wst.web.internal,
- org.eclipse.wst.web.internal.deployables,
- org.eclipse.wst.web.internal.operation
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.runtime,
- org.eclipse.core.commands,
- org.eclipse.wst.validation,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.server.core,
- org.eclipse.jem.util,
- org.eclipse.wst.common.modulecore,
- org.eclipse.emf.ecore,
- org.eclipse.wst.common.project.facet.core
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.wst.web/about.html b/plugins/org.eclipse.wst.web/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.wst.web/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 Redistributor's 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/build.properties b/plugins/org.eclipse.wst.web/build.properties
deleted file mode 100644
index 7058501..0000000
--- a/plugins/org.eclipse.wst.web/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html,\
- .
-jars.compile.order = .
-src.includes = component.xml,\
- property_files/,\
- plugin.xml,\
- plugin.properties
-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.gif b/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 57c68b3..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.gif
+++ /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 c6a4955..0000000
--- a/plugins/org.eclipse.wst.web/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
diff --git a/plugins/org.eclipse.wst.web/plugin.xml b/plugins/org.eclipse.wst.web/plugin.xml
deleted file mode 100644
index af689fb..0000000
--- a/plugins/org.eclipse.wst.web/plugin.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <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"/>
- </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"/>
- </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>Static Web Module</label>
- <description>Enables the project to be deployed as a static web module.</description>
- <icon>icons/full/obj16/webstatic_deploy.gif</icon>
- </project-facet>
-
- <project-facet-version facet="wst.web" version="1.0">
-
- <action type="install">
- <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDelegate"/>
- <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
- </action>
- <constraint>
- <and>
- <conflicts group="modules"/>
- <conflicts group="java"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- <group-member id="java"/>
- </project-facet-version>
-
-
- <template id="template.wst.web">
- <label>Simple Web Project</label>
- <fixed facet="wst.web"/>
- </template>
-
- </extension>
-</plugin>
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 b270142..0000000
--- a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-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 runtime:
-NewDotDotDot=N&ew...
-InvalidServerTarget=Invalid target server selected.
-ConfigureSettings=Configure Static Web module settings.
\ No newline at end of file
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 4a4fddb..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-public interface ISimpleWebFacetInstallDataModelProperties {
-
- 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/SimpleWebFacetInstallDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
deleted file mode 100644
index 366b4dc..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-import java.util.Set;
-
-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;
-
-public class SimpleWebFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ISimpleWebFacetInstallDataModelProperties {
-
- public SimpleWebFacetInstallDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CONTENT_DIR);
- names.add(CONTEXT_ROOT);
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CONTENT_DIR)) {
- return "WebContent"; //$NON-NLS-1$
- } else if (propertyName.equals(CONTEXT_ROOT)) {
- return getProperty(FACET_PROJECT_NAME);
- } else if (propertyName.equals(FACET_ID)) {
- return IModuleConstants.WST_WEB_MODULE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- 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);
- }
-}
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 6aa9463..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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;
-
-public class SimpleWebFacetInstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-
- IDataModel model = (IDataModel) config;
- addNatures(project);
- final IVirtualComponent c = ComponentCore.createComponent(project);
- c.create(0, null);
- final IVirtualFolder webroot = c.getRootFolder();
- 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) {
- Logger.getLogger().logError(e);
- }
- }
-
- 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);
- }
-
-}
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 e561581..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class SimpleWebFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
-
- public SimpleWebFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel simpleWebFacet = DataModelFactory.createDataModel(new SimpleWebFacetInstallDataModelProvider());
- map.add(simpleWebFacet);
- }
-
-}
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 0e8fd62..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Created on Dec 14, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-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)
- */
- 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()
- */
- public int hashCode() {
- if (delegateElement == null)
- return -1;
- return delegateElement.hashCode();
- }
-
- /**
- * @return
- */
- public boolean isValid() {
-
- if (delegateElement == null)
- return false;
- return delegateElement.isValid();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- if (delegateElement == null)
- return DELEGATE_NULL_STRING;
- return delegateElement.toString();
- }
-
-}
\ No newline at end of file
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 e86b07b..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
+++ /dev/null
@@ -1,21 +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 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$
-}
\ No newline at end of file
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 87c27dc..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
+++ /dev/null
@@ -1,37 +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;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ResourceHandler.class);
- }
-}
\ 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 a5394d9..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
+++ /dev/null
@@ -1,66 +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.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * 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 PLUGIN_ID = "com.ibm.etools.webtools.staticwebproject"; //$NON-NLS-1$
- 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 constructor.
- */
- public WSTWebPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static WSTWebPlugin getDefault()
- {
- return plugin;
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- protected void initializeDefaultPluginPreferences() {
- getWSTWebPreferences().initializeDefaultPreferences();
- }
- /**
- * @return Returns the preferences.
- */
- public WSTWebPreferences getWSTWebPreferences() {
- if (this.preferences == null)
- this.preferences = new WSTWebPreferences(this);
- return this.preferences;
- }
-}
\ No newline at end of file
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 79a7677..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
+++ /dev/null
@@ -1,106 +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 java.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("") || name == null) { //$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;
- }
-
-}
\ No newline at end of file
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 aae4320..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
+++ /dev/null
@@ -1,329 +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.deployables;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-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.resources.ResourcesPlugin;
-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.internal.resources.VirtualArchiveComponent;
-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.internal.ModuleFile;
-import org.eclipse.wst.server.core.internal.ModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-public abstract class ComponentDeployable extends ProjectModule {
-
- protected IVirtualComponent component = null;
- protected List members = new ArrayList();
-
- public ComponentDeployable(IProject project) {
- super(project);
- this.component = ComponentCore.createComponent(project);
- }
-
- /**
- * @see org.eclipse.jst.server.core.IJ2EEModule#isBinary()
- */
- public boolean isBinary() {
- return false;
- }
-
- private void addMembersToModuleFolder(ModuleFolder mf, IModuleResource[] mr) {
- if (mf == null) return;
- Set membersJoin = new HashSet();
- if (mf.members() != null)
- membersJoin.addAll(Arrays.asList(mf.members()));
- if (mr != null && mr.length > 0)
- membersJoin.addAll(Arrays.asList(mr));
- mf.setMembers((IModuleResource[]) membersJoin.toArray(new IModuleResource[membersJoin.size()]));
- }
-
- /**
- * Returns the child modules of this module.
- *
- * @return org.eclipse.wst.server.core.model.IModule[]
- */
- public IModule[] getChildModules() {
- return getModules();
- }
-
- public IModule[] getModules() {
- List modules = new ArrayList();
- if (component != null) {
- IVirtualReference[] components = component.getReferences();
- 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();
- if (virtualComp != null && virtualComp.getProject()!=component.getProject()) {
- Object module = ServerUtil.getModule(virtualComp.getProject());
- if (module != null && !modules.contains(module))
- modules.add(module);
- }
- }
- }
- }
- return (IModule[]) modules.toArray(new IModule[modules.size()]);
- }
-
- /**
- * 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 list = new ArrayList(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(), newPath);
- 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);
- ModuleFile mFile = new ModuleFile(f, f.getName(), javaPath, f.getModificationStamp() + f.getLocalTimeStamp());
- if (mFolder != null)
- addMembersToModuleFolder(mFolder,new IModuleResource[]{mFile});
- else
- list.add(mFile);
- } else {
- ModuleFile mf = new ModuleFile(f, f.getName(), path, f.getModificationStamp() + f.getLocalTimeStamp());
- list.add(mf);
- }
- }
- }
- IModuleResource[] mr = new IModuleResource[list.size()];
- list.toArray(mr);
- return mr;
- }
-
- protected IModuleResource[] getMembers(IVirtualContainer cont, IPath path) throws CoreException {
- IVirtualResource[] res = cont.members();
- int size2 = res.length;
- List list = new ArrayList(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();
- if (!isFileInSourceContainer(f)) {
- ModuleFile mf = new ModuleFile(f, f.getName(), path, f.getModificationStamp() + f.getLocalTimeStamp());
- 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;
- }
- protected boolean isFileInSourceContainer(IFile file) {
- return false;
- }
- protected IModuleResource getExistingModuleResource(List aList, IPath path) {
- IModuleResource result = null;
- // If the list is empty, return null
- if (aList==null || aList.isEmpty())
- return null;
- // Otherwise recursively check to see if given resource matches current resource or if it is a child
- int i=0;
- do {
- IModuleResource moduleResource = (IModuleResource) aList.get(i);
- if (moduleResource.getModuleRelativePath().append(moduleResource.getName()).equals(path))
- result = moduleResource;
- // if it is a folder, check its children for the resource path
- else if (moduleResource instanceof IModuleFolder) {
- if (((IModuleFolder)moduleResource).members()!=null)
- result = getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path);
- }
- i++;
- } while (result == null && i<aList.size() );
- return result;
- }
-
- protected IModuleResource[] handleJavaPath(IPath path, IPath javaPath, IPath curPath, IContainer[] javaCont, IModuleResource[] mr, IContainer cc) throws CoreException {
- //subclasses may override
- return new IModuleResource[]{};
- }
-
- 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++) {
- if (!members.contains(mr[j]))
- members.add(mr[j]);
- }
- List utilMembers = getUtilMembers(vc);
- if (!utilMembers.isEmpty())
- members.addAll(utilMembers);
- }
-
- IModuleResource[] mr = new IModuleResource[members.size()];
- members.toArray(mr);
- return mr;
- }
-
- protected List getUtilMembers(IVirtualComponent vc) {
- List utilMembers = new ArrayList();
- IVirtualReference[] components = vc.getReferences();
- for (int i = 0; i < components.length; i++) {
- IVirtualReference reference = components[i];
- IVirtualComponent virtualComp = reference.getReferencedComponent();
- if (virtualComp != null && virtualComp.isBinary()) {
- IPath archivePath = ((VirtualArchiveComponent)virtualComp).getWorkspaceRelativePath();
- ModuleFile mf = null;
- if (archivePath != null) { //In Workspace
- IFile utilFile = ResourcesPlugin.getWorkspace().getRoot().getFile(archivePath);
- mf = new ModuleFile(utilFile, utilFile.getName(), reference.getRuntimePath().makeRelative());
- }
- else {
- File extFile = ((VirtualArchiveComponent)virtualComp).getUnderlyingDiskFile();
- mf = new ModuleFile(extFile, extFile.getName(), reference.getRuntimePath().makeRelative());
- }
- if (mf == null)
- continue;
- 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)vc.getRootFolder().getUnderlyingResource());
- addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[] {mf});
- }
- }
- }
- }
- return utilMembers;
- }
-
- 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/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 ff46644..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, 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 java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-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.componentcore.resources.IVirtualReference;
-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.util.IStaticWeb;
-
-public class StaticWebDeployable extends ComponentDeployable 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();
- }
-
- 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$
- }
-
-}
\ No newline at end of file
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 f3856a2..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
+++ /dev/null
@@ -1,129 +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 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.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-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;
-
-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;
- }
- protected IModule createModule(ModuleCoreNature nature) {
- IProject project = nature.getProject();
- try {
- IVirtualComponent comp = ComponentCore.createComponent(project);
- return createModuleDelegates(comp);
- } catch (Exception e) {
- Logger.getLogger().write(e);
- }
- 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)
- */
- 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;
-
- }
-
- protected IModule createModule(IProject project) {
- try {
- ModuleCoreNature nature = (ModuleCoreNature) project.getNature(IModuleConstants.MODULE_NATURE_ID);
- if (nature != null)
- return createModule(nature);
- } catch (CoreException e) {
- Logger.getLogger().write(e);
- }
- return null;
- }
-
- protected IModule createModuleDelegates(IVirtualComponent component) throws CoreException {
- 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) {
- Logger.getLogger().write(e);
- } finally {
- if (module != null) {
- if (getModuleDelegate(module) == null)
- moduleDelegates.add(moduleDelegate);
- }
- }
- return 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
- */
- protected IPath[] getListenerPaths() {
- return new IPath[] {
- new Path(".project"), // nature
- new Path(".settings/.component"), // component
- new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets
- };
- }
-}
\ No newline at end of file
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 f29938e..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
+++ /dev/null
@@ -1,35 +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};
- }
-
- 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 6261b36..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
+++ /dev/null
@@ -1,86 +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.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.resources.IVirtualComponent;
-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 = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
- if (resource == null)
- return null;
-
- if (resource instanceof IProject)
- return new WebResource(getModule((IProject)resource), new Path("")); //$NON-NLS-1$
-
- IProject project = ProjectUtilities.getProject(resource);
- 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) {
- return ServerUtil.getModule(project);
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java
deleted file mode 100644
index a8df747..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java
+++ /dev/null
@@ -1,26 +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.operation;
-
-import org.eclipse.core.resources.IProject;
-
-//TODO DELETE jsholl
-/**
- * @deprecated
- *
- */
-public interface ILibModule {
- String getJarName();
-
- String getProjectName();
-
- String getURI();
-
- IProject getProject();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ISimpleWebModuleCreationDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ISimpleWebModuleCreationDataModelProperties.java
deleted file mode 100644
index b1780cb..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ISimpleWebModuleCreationDataModelProperties.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-
-public interface ISimpleWebModuleCreationDataModelProperties extends IComponentCreationDataModelProperties {
-
- /**
- * Optional, type String, the user defined name of web contents folder
- */
- public static final String WEBCONTENT_FOLDER = "IWebComponentCreationDataModelProperties.WEBCONTENT_FOLDER"; //$NON-NLS-1$
-
-
-}
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 7da8fc9..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-
-
-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/LibModule.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java
deleted file mode 100644
index 7227399..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java
+++ /dev/null
@@ -1,73 +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.operation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.web.internal.ISimpleWebModuleConstants;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-/**
- * @deprecated
- *
- */
-public class LibModule implements ILibModule {
- protected static final IPath LIB_PATH = new Path(ISimpleWebModuleConstants.INFO_DIRECTORY).append(ISimpleWebModuleConstants.LIBRARY_DIRECTORY);
-
- private String jarName;
- private String projectName;
-
- public LibModule(String jarName, String projectName) {
- this.jarName = jarName;
- this.projectName = projectName;
- }
-
- /*
- * @see ILibModule#getJarName()
- */
- public String getJarName() {
- return jarName;
- }
-
- /*
- * @see ILibModule#getProjectName()
- */
- public String getProjectName() {
- return projectName;
- }
-
- /*
- * @see ILibModule#getProject()
- */
- public IProject getProject() {
- return (IProject) WSTWebPlugin.getWorkspace().getRoot().findMember(projectName);
- }
-
- /**
- * @see ILibModule#getURI()
- */
- public String getURI() {
- return IPath.SEPARATOR + LIB_PATH.append(getJarName()).toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (obj == null || !(obj instanceof ILibModule)) {
- return false;
- }
- ILibModule module = (ILibModule) obj;
- return getJarName().equals(module.getJarName()) && getProjectName().equals(module.getProjectName()) && getURI().equals(module.getURI()) && getProject().equals(module.getProject());
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModelProvider.java
deleted file mode 100644
index af17fae..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModelProvider.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.wst.common.componentcore.datamodel.FlexibleProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.operation.ComponentCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationProperties;
-
-public class SimpleWebModuleCreationDataModelProvider extends ComponentCreationDataModelProvider implements ISimpleWebModuleCreationDataModelProperties {
-
- public SimpleWebModuleCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new StaticWebModuleCreationFacetOperation(model);
- }
-
- protected EClass getComponentType() {
- // TODO Auto-generated method stub
- return null;
- }
-
- protected Integer getDefaultComponentVersion() {
- // TODO Auto-generated method stub
- return null;
- }
-
- protected String getComponentExtension() {
- return ".war"; //$NON-NLS-1$
- }
-
- protected void initProjectCreationModel() {
- IDataModel dm = DataModelFactory.createDataModel(new FlexibleProjectCreationDataModelProvider());
- model.addNestedModel(NESTED_PROJECT_CREATION_DM, dm);
- model.setProperty(LOCATION, dm.getProperty(IProjectCreationProperties.PROJECT_LOCATION));
- }
-
- protected List getProperties() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(WEBCONTENT_FOLDER);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(WEBCONTENT_FOLDER))
- return "WebContent"; //$NON-NLS-1$
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean result = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(PROJECT_NAME))
- setProperty(COMPONENT_NAME,propertyValue);
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebModuleCreationFacetOperation.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebModuleCreationFacetOperation.java
deleted file mode 100644
index cb3f822..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebModuleCreationFacetOperation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.project.facet.ISimpleWebFacetInstallDataModelProperties;
-import org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider;
-
-public class StaticWebModuleCreationFacetOperation extends AbstractDataModelOperation {
-
- public StaticWebModuleCreationFacetOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
- FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(setupWebInstallAction());
-
- IStatus stat = OK_STATUS;
- try {
- stat = dm.getDefaultOperation().execute(monitor, info);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- return stat;
- }
-
- protected IDataModel setupWebInstallAction() {
- String versionStr = "1.0";
- IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new SimpleWebFacetInstallDataModelProvider());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
- webFacetInstallDataModel.setProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR, model.getStringProperty(ISimpleWebModuleCreationDataModelProperties.WEBCONTENT_FOLDER));
-
- return webFacetInstallDataModel;
- }
-}
\ No newline at end of file
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 ddc00e4..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class WebProjectPropertiesUpdateDataModelProvider
- extends AbstractDataModelProvider
- implements IWebProjectPropertiesUpdateDataModelProperties{
-
- public WebProjectPropertiesUpdateDataModelProvider(){
- super();
- }
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(PROJECT);
- names.add(CONTEXT_ROOT);
- return names;
- }
-
- 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 336e611..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-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.util.ComponentUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-
-/**
- * @version 1.0
- * @author
- */
-public class WebProjectPropertiesUpdateOperation
- extends AbstractDataModelOperation
- implements IWebProjectPropertiesUpdateDataModelProperties{
-
-
- public WebProjectPropertiesUpdateOperation(IDataModel model) {
- super(model);
- }
-
- 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;
- }
-
-}
